Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the high level Azure API in image drawing

Browse source
This commit is contained in:
Patrick Walton 2012-08-16 18:34:37 -07:00
parent 077720fc49
commit 5c2795c602
1 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/servo/gfx/renderer.rs
View file

@ -12,7 +12,8 @@ import dom::event::{Event, ResizeEvent};
import geom::size::Size2D; import geom::size::Size2D;
import geom::rect::Rect; import geom::rect::Rect;
import geom::point::Point2D; import geom::point::Point2D;
import azure_hl::{AsAzureRect, Color, ColorPattern, DrawTarget}; import azure_hl::{AsAzureRect, B8G8R8A8, Color, ColorPattern, DrawOptions, DrawSurfaceOptions};
import azure_hl::{DrawTarget, Linear};
import ptr::addr_of; import ptr::addr_of;
import std::arc::arc; import std::arc::arc;
import azure::cairo::{cairo_font_face_t, cairo_scaled_font_t}; import azure::cairo::{cairo_font_face_t, cairo_scaled_font_t};
@ -102,25 +103,27 @@ fn draw_display_list(azure_draw_target: AzDrawTargetRef, display_list: dl::displ
} }
} }
trait ToAzureRect {
fn to_azure_rect() -> Rect<AzFloat>;
}
impl Rect<au> : ToAzureRect {
fn to_azure_rect() -> Rect<AzFloat> {
Rect(Point2D(au_to_px(self.origin.x) as AzFloat, au_to_px(self.origin.y) as AzFloat),
Size2D(au_to_px(self.size.width) as AzFloat, au_to_px(self.size.height) as AzFloat))
}
}
fn draw_solid_color(draw_target: &DrawTarget, item: dl::display_item, r: u8, g: u8, b: u8) { fn draw_solid_color(draw_target: &DrawTarget, item: dl::display_item, r: u8, g: u8, b: u8) {
let color = Color(r.to_float() as AzFloat, let color = Color(r.to_float() as AzFloat,
g.to_float() as AzFloat, g.to_float() as AzFloat,
b.to_float() as AzFloat, b.to_float() as AzFloat,
1f as AzFloat); 1f as AzFloat);
let pattern = ColorPattern(color); draw_target.fill_rect(item.bounds.to_azure_rect(), ColorPattern(color));
let rect = Rect(Point2D(au_to_px(item.bounds.origin.x) as AzFloat,
au_to_px(item.bounds.origin.y) as AzFloat),
Size2D(au_to_px(item.bounds.size.width) as AzFloat,
au_to_px(item.bounds.size.height) as AzFloat));
draw_target.fill_rect(rect, pattern);
} }
fn draw_image(draw_target: &DrawTarget, item: dl::display_item, image: arc<~Image>) unsafe { fn draw_image(draw_target: &DrawTarget, item: dl::display_item, image: arc<~Image>) unsafe {
let draw_target = draw_target.azure_draw_target;
let image = std::arc::get(&image); let image = std::arc::get(&image);
let size = Size2D(image.width as i32, image.height as i32); let size = Size2D(image.width as i32, image.height as i32);
let stride = image.width * 4; let stride = image.width * 4;
@ -138,27 +141,15 @@ fn draw_image(draw_target: &DrawTarget, item: dl::display_item, image: arc<~Imag
} }
}; };
let azure_surface = let azure_surface = draw_target.create_source_surface_from_data(data, size, stride as i32,
AzDrawTargetCreateSourceSurfaceFromData(draw_target, B8G8R8A8);
addr_of(data[0]), let source_rect = Rect(Point2D(0 as AzFloat, 0 as AzFloat),
unsafe::reinterpret_cast(addr_of(size)),
stride as i32,
0u32);
let source_rect = Rect(Point2D(0.0f as AzFloat, 0.0f as AzFloat),
Size2D(image.width as AzFloat, image.height as AzFloat)); Size2D(image.width as AzFloat, image.height as AzFloat));
let dest_rect = Rect(Point2D(au_to_px(item.bounds.origin.x) as AzFloat, let dest_rect = item.bounds.to_azure_rect();
au_to_px(item.bounds.origin.y) as AzFloat), let draw_surface_options = DrawSurfaceOptions(Linear, true);
Size2D(au_to_px(item.bounds.size.width) as AzFloat, let draw_options = DrawOptions(1.0f as AzFloat, 0);
au_to_px(item.bounds.size.height) as AzFloat)); draw_target.draw_surface(azure_surface, dest_rect, source_rect, draw_surface_options,
let draw_surface_options = azure_hl::DrawSurfaceOptions(azure_hl::Linear, true); draw_options);
let draw_options = azure_hl::DrawOptions(1.0f as AzFloat, 0);
AzDrawTargetDrawSurface(draw_target,
azure_surface,
addr_of(dest_rect.as_azure_rect()),
addr_of(source_rect.as_azure_rect()),
addr_of(draw_surface_options.as_azure_draw_surface_options()),
addr_of(draw_options.as_azure_draw_options()));
AzReleaseSourceSurface(azure_surface);
} }
fn draw_text(draw_target: &DrawTarget, item: dl::display_item, text_run: TextRun) { fn draw_text(draw_target: &DrawTarget, item: dl::display_item, text_run: TextRun) {