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

gfx: Make some minor formatting cleanups.

Browse source
This commit is contained in:
Patrick Walton 2015-08-21 14:07:41 -07:00
parent b66f17a445
commit e835fb6514
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/gfx/paint_context.rs
View file

@ -960,8 +960,7 @@ impl<'a> PaintContext<'a> {
// FIXME(https://github.com/rust-lang/rust/issues/23338) // FIXME(https://github.com/rust-lang/rust/issues/23338)
let font = self.font_context.get_paint_font_from_template( let font = self.font_context.get_paint_font_from_template(
&text.text_run.font_template, text.text_run.actual_pt_size); &text.text_run.font_template, text.text_run.actual_pt_size);
font font.borrow()
.borrow()
.draw_text(&temporary_draw_target.draw_target, .draw_text(&temporary_draw_target.draw_target,
&*text.text_run, &*text.text_run,
&text.range, &text.range,
@ -1029,7 +1028,8 @@ impl<'a> PaintContext<'a> {
// Calculate the transform matrix. // Calculate the transform matrix.
let old_transform = self.draw_target.get_transform(); let old_transform = self.draw_target.get_transform();
let inflated_size = Rect::new(Point2D::new(0.0, 0.0), Size2D::new(size.width as AzFloat, let inflated_size = Rect::new(Point2D::new(0.0, 0.0),
Size2D::new(size.width as AzFloat,
size.height as AzFloat)); size.height as AzFloat));
let temporary_draw_target_bounds = old_transform.transform_rect(&inflated_size); let temporary_draw_target_bounds = old_transform.transform_rect(&inflated_size);
matrix = Matrix2D::identity().translate( matrix = Matrix2D::identity().translate(
@ -1060,7 +1060,8 @@ impl<'a> PaintContext<'a> {
self.draw_target.set_transform(&Matrix2D::identity()); self.draw_target.set_transform(&Matrix2D::identity());
let rect = Rect::new(Point2D::new(0.0, 0.0), self.draw_target.get_size().to_azure_size()); let rect = Rect::new(Point2D::new(0.0, 0.0), self.draw_target.get_size().to_azure_size());
let rect_temporary = Rect::new(Point2D::new(0.0, 0.0), temporary_draw_target.get_size().to_azure_size()); let rect_temporary = Rect::new(Point2D::new(0.0, 0.0),
temporary_draw_target.get_size().to_azure_size());
// Create the Azure filter pipeline. // Create the Azure filter pipeline.
let mut accum_blur = Au(0); let mut accum_blur = Au(0);
@ -1081,7 +1082,10 @@ impl<'a> PaintContext<'a> {
self.pop_clip_if_applicable(); self.pop_clip_if_applicable();
debug!("######### use expanded Rect."); debug!("######### use expanded Rect.");
self.draw_target.draw_filter(&filter_node, &rect_temporary, &rect_temporary.origin, draw_options); self.draw_target.draw_filter(&filter_node,
&rect_temporary,
&rect_temporary.origin,
draw_options);
self.push_clip_if_applicable(); self.push_clip_if_applicable();
} else { } else {
debug!("######### use regular Rect."); debug!("######### use regular Rect.");
@ -1132,7 +1136,8 @@ impl<'a> PaintContext<'a> {
} }
// Draw the shadow, and blur if we need to. // Draw the shadow, and blur if we need to.
temporary_draw_target.draw_target.fill(&path, temporary_draw_target.draw_target.fill(
&path,
Pattern::Color(ColorPattern::new(color)).to_pattern_ref(), Pattern::Color(ColorPattern::new(color)).to_pattern_ref(),
&DrawOptions::new(1.0, CompositionOp::Over, AntialiasMode::None)); &DrawOptions::new(1.0, CompositionOp::Over, AntialiasMode::None));
self.blur_if_necessary(temporary_draw_target, blur_radius); self.blur_if_necessary(temporary_draw_target, blur_radius);