Revert "Updates for changes in rust-geom and rust-layers"

This commit is contained in:
Patrick Walton 2015-06-10 14:14:51 -07:00
parent 053296e131
commit e42011cd53
7 changed files with 14 additions and 14 deletions

View file

@ -245,7 +245,7 @@ pub struct StackingContext {
pub blend_mode: mix_blend_mode::T,
/// A transform to be applied to this stacking context.
pub transform: Matrix4,
pub transform: Matrix4<AzFloat>,
}
impl StackingContext {
@ -255,7 +255,7 @@ impl StackingContext {
bounds: &Rect<Au>,
overflow: &Rect<Au>,
z_index: i32,
transform: &Matrix4,
transform: &Matrix4<AzFloat>,
filters: filter::T,
blend_mode: mix_blend_mode::T,
layer: Option<Arc<PaintLayer>>)
@ -276,7 +276,7 @@ impl StackingContext {
pub fn optimize_and_draw_into_context(&self,
paint_context: &mut PaintContext,
tile_bounds: &Rect<AzFloat>,
transform: &Matrix4,
transform: &Matrix4<AzFloat>,
clip_rect: Option<&Rect<Au>>) {
let transform = transform.mul(&self.transform);
let temporary_draw_target =

View file

@ -622,7 +622,7 @@ impl WorkerThread {
stacking_context.overflow.origin.y.to_f32_px()));
// Apply the translation to paint the tile we want.
let matrix: Matrix4 = identity();
let matrix: Matrix4<AzFloat> = identity();
let matrix = matrix.scale(scale as AzFloat, scale as AzFloat, 1.0);
let matrix = matrix.translate(-tile_bounds.origin.x as AzFloat,
-tile_bounds.origin.y as AzFloat,