Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix rebase conflicts

Browse source
This commit is contained in:
Manish Goregaokar 2015-06-03 09:56:07 +05:30
parent d2496a45c3
commit d347aeda38
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/gfx/display_list/mod.rs
View file

@ -27,7 +27,7 @@ use azure::azure::AzFloat;
use azure::azure_hl::Color; use azure::azure_hl::Color;
use collections::linked_list::{self, LinkedList}; use collections::linked_list::{self, LinkedList};
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D}; use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
use geom::approxeq::ApproxEq; use geom::approxeq::ApproxEq;
use geom::num::Zero; use geom::num::Zero;
use libc::uintptr_t; use libc::uintptr_t;
@ -245,7 +245,7 @@ pub struct StackingContext {
pub blend_mode: mix_blend_mode::T, pub blend_mode: mix_blend_mode::T,
/// A transform to be applied to this stacking context. /// A transform to be applied to this stacking context.
pub transform: Matrix2D<AzFloat>, pub transform: Matrix4<AzFloat>,
} }
impl StackingContext { impl StackingContext {
@ -255,7 +255,7 @@ impl StackingContext {
bounds: &Rect<Au>, bounds: &Rect<Au>,
overflow: &Rect<Au>, overflow: &Rect<Au>,
z_index: i32, z_index: i32,
transform: &Matrix2D<AzFloat>, transform: &Matrix4<AzFloat>,
filters: filter::T, filters: filter::T,
blend_mode: mix_blend_mode::T, blend_mode: mix_blend_mode::T,
layer: Option<Arc<PaintLayer>>) layer: Option<Arc<PaintLayer>>)
@ -276,7 +276,7 @@ impl StackingContext {
pub fn optimize_and_draw_into_context(&self, pub fn optimize_and_draw_into_context(&self,
paint_context: &mut PaintContext, paint_context: &mut PaintContext,
tile_bounds: &Rect<AzFloat>, tile_bounds: &Rect<AzFloat>,
transform: &Matrix2D<AzFloat>, transform: &Matrix4<AzFloat>,
clip_rect: Option<&Rect<Au>>) { clip_rect: Option<&Rect<Au>>) {
let transform = transform.mul(&self.transform); let transform = transform.mul(&self.transform);
let temporary_draw_target = let temporary_draw_target =
@ -309,7 +309,10 @@ impl StackingContext {
// Set up our clip rect and transform. // Set up our clip rect and transform.
let old_transform = paint_subcontext.draw_target.get_transform(); let old_transform = paint_subcontext.draw_target.get_transform();
paint_subcontext.draw_target.set_transform(&transform); let xform_2d = Matrix2D::new(transform.m11, transform.m12,
transform.m21, transform.m22,
transform.m41, transform.m42);
paint_subcontext.draw_target.set_transform(&xform_2d);
paint_subcontext.push_clip_if_applicable(); paint_subcontext.push_clip_if_applicable();
// Steps 1 and 2: Borders and background for the root. // Steps 1 and 2: Borders and background for the root.
@ -331,7 +334,8 @@ impl StackingContext {
positioned_kid.bounds positioned_kid.bounds
.origin .origin
.y .y
.to_nearest_px() as AzFloat); .to_nearest_px() as AzFloat,
0.0);
let new_tile_rect = let new_tile_rect =
self.compute_tile_rect_for_child_stacking_context(tile_bounds, self.compute_tile_rect_for_child_stacking_context(tile_bounds,
&**positioned_kid); &**positioned_kid);
@ -379,7 +383,8 @@ impl StackingContext {
positioned_kid.bounds positioned_kid.bounds
.origin .origin
.y .y
.to_nearest_px() as AzFloat); .to_nearest_px() as AzFloat,
0.0);
let new_tile_rect = let new_tile_rect =
self.compute_tile_rect_for_child_stacking_context(tile_bounds, self.compute_tile_rect_for_child_stacking_context(tile_bounds,
&**positioned_kid); &**positioned_kid);
@ -903,7 +908,7 @@ pub struct BorderDisplayItem {
/// Information about the border radii. /// Information about the border radii.
/// ///
/// TODO(pcwalton): Elliptical radii. /// TODO(pcwalton): Elliptical radii.
#[derive(Clone, Default, PartialEq, Debug, Copy)] #[derive(Clone, Default, PartialEq, Debug, Copy, HeapSizeOf)]
pub struct BorderRadii<T> { pub struct BorderRadii<T> {
pub top_left: T, pub top_left: T,
pub top_right: T, pub top_right: T,

4
components/util/mem.rs
View file

@ -12,7 +12,7 @@ use std::sync::Arc;
use azure::azure_hl::Color; use azure::azure_hl::Color;
use cursor::Cursor; use cursor::Cursor;
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D}; use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
use geometry::Au; use geometry::Au;
use range::Range; use range::Range;
@ -193,7 +193,7 @@ known_heap_size!(0, u8, u16, u32, u64, usize);
known_heap_size!(0, i8, i16, i32, i64, isize); known_heap_size!(0, i8, i16, i32, i64, isize);
known_heap_size!(0, bool, f32, f64); known_heap_size!(0, bool, f32, f64);
known_heap_size!(0, Rect<T>, Point2D<T>, Size2D<T>, Matrix2D<T>, SideOffsets2D<T>); known_heap_size!(0, Rect<T>, Point2D<T>, Size2D<T>, Matrix2D<T>, SideOffsets2D<T>, Matrix4<T>);
known_heap_size!(0, Au, Color, Cursor); known_heap_size!(0, Au, Color, Cursor);
known_heap_size!(0, Range<T>); known_heap_size!(0, Range<T>);