From a29e961fde659f4e2913d844c92789036fa45041 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Wed, 22 Apr 2015 19:37:04 -0700 Subject: [PATCH] Bug 1156456 patch 2 - Transform the z component just like the x and y. r=birtles I confirmed locally that this patch fixes the reftest (per reftest.list change). --- gfx/layers/composite/AsyncCompositionManager.cpp | 2 ++ layout/reftests/transform-3d/reftest.list | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp index 4f242dacced3..4c6777b3d785 100644 --- a/gfx/layers/composite/AsyncCompositionManager.cpp +++ b/gfx/layers/composite/AsyncCompositionManager.cpp @@ -413,9 +413,11 @@ SampleValue(float aPortion, Animation& aAnimation, StyleAnimationValue& aStart, Point3D transformOrigin = data.transformOrigin(); transformOrigin.x = transformOrigin.x * cssPerDev; transformOrigin.y = transformOrigin.y * cssPerDev; + transformOrigin.z = transformOrigin.z * cssPerDev; Point3D perspectiveOrigin = data.perspectiveOrigin(); perspectiveOrigin.x = perspectiveOrigin.x * cssPerDev; perspectiveOrigin.y = perspectiveOrigin.y * cssPerDev; + perspectiveOrigin.z = perspectiveOrigin.z * cssPerDev; nsDisplayTransform::FrameTransformProperties props(interpolatedList, transformOrigin, perspectiveOrigin, diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list index c58104251e16..4b1b1d88790e 100644 --- a/layout/reftests/transform-3d/reftest.list +++ b/layout/reftests/transform-3d/reftest.list @@ -58,5 +58,5 @@ fuzzy-if(winWidget&&!layersGPUAccelerated,1,606) == scroll-perspective-1.html sc # Bugs fails-if(!layersGPUAccelerated) == 1035611-1.html 1035611-1-ref.html # Bug 1072898 for !layersGPUAccelerated failures == animate-cube.html animate-cube-ref.html -fails == animate-cube-zoom.html animate-cube-zoom-ref.html # Bug 1156456 +fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated,16,6) == animate-cube-zoom.html animate-cube-zoom-ref.html != animate-cube-ref.html animate-cube-zoom-ref.html