Backed out changeset ceb8532131fb (bug 1223736) for reftest failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 18 Mar 2016 09:58:39 +0100
changeset 289381 51803770c37d818e9e0a14ba946d0f76822938c6
parent 289380 b34c0c51ae702ae77f915d873081aefce052df50
child 289382 9c5d494d05485aebf3fedf649abc0e7ae9d2dcf2
child 289388 55c8414f6269149453a9141b4ea11e01e1d1bb37
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1223736
milestone48.0a1
backs outceb8532131fb64a9029f4ffeb146af8ea7f7537e
Backed out changeset ceb8532131fb (bug 1223736) for reftest failures
gfx/layers/Layers.cpp
layout/reftests/layers/mask-layer-transform-ref.html
layout/reftests/layers/mask-layer-transform.html
layout/reftests/layers/reftest.list
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -1461,17 +1461,21 @@ ContainerLayer::DefaultComputeEffectiveT
   }
   mUseIntermediateSurface = useIntermediateSurface && !GetLocalVisibleRegion().IsEmpty();
   if (useIntermediateSurface) {
     ComputeEffectiveTransformsForChildren(Matrix4x4::From2D(residual));
   } else {
     ComputeEffectiveTransformsForChildren(idealTransform);
   }
 
-  ComputeEffectiveTransformForMaskLayers(aTransformToSurface);
+  if (idealTransform.CanDraw2D()) {
+    ComputeEffectiveTransformForMaskLayers(aTransformToSurface);
+  } else {
+    ComputeEffectiveTransformForMaskLayers(Matrix4x4());
+  }
 }
 
 void
 ContainerLayer::DefaultComputeSupportsComponentAlphaChildren(bool* aNeedsSurfaceCopy)
 {
   if (!(GetContentFlags() & Layer::CONTENT_COMPONENT_ALPHA_DESCENDANT) ||
       !Manager()->AreComponentAlphaLayersEnabled()) {
     mSupportsComponentAlphaChildren = false;
deleted file mode 100644
--- a/layout/reftests/layers/mask-layer-transform-ref.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<body>
-    <div style="position:relative; left: 400px; width: 200px; height: 200px; overflow:hidden; border-radius: 20px;">
-        <div style="width:200px; height:200px; background-color:red; transform: perspective(100px) rotateY(10deg)"></div>
-    </div>
-</body>
-</html>
-
deleted file mode 100644
--- a/layout/reftests/layers/mask-layer-transform.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body>
-    <div style="width:200px; height: 200px; transform: translate(400px);">
-        <div style="width: 200px; height: 200px; overflow:hidden; border-radius: 20px;">
-            <div style="width:200px; height:200px; background-color:red; transform: perspective(100px) rotateY(10deg)"></div>
-        </div>
-  </div>
-</body>
-</html>
-
--- a/layout/reftests/layers/reftest.list
+++ b/layout/reftests/layers/reftest.list
@@ -14,9 +14,8 @@ skip != pull-background-animated-positio
 skip != pull-background-animated-position-5.html about:blank # Fails because ownLayer bounds don't anticipate changes of animated contents, but doesn't fail with event regions
 skip-if(!asyncPan) != pull-background-displayport-1.html about:blank
 skip-if(!asyncPan) != pull-background-displayport-2.html about:blank
 skip-if(!asyncPan) != pull-background-displayport-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
 skip-if(!asyncPan) != pull-background-displayport-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
 skip-if(!asyncPan) != pull-background-displayport-5.html about:blank
 skip-if(!asyncPan) != pull-background-displayport-6.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
 fuzzy(2,30150) == opacity-blending.html opacity-blending-ref.html
-fuzzy(1,1) == mask-layer-transform.html mask-layer-transform-ref.html