Backed out changeset 7d3e3c0a23c6 (bug 1332268) for failing own reftest component-alpha-1.html on Windows 7 debug. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 20 Jan 2017 16:06:58 +0100
changeset 464568 ec7143bb25f0a4fab2b783a833da6b763ffb3e10
parent 464567 ed9c070f9bb47121a7adb11b306667283c45ad65
child 464569 e8c9758e6322ef6de8a7c03deefcc49417382f96
push id42370
push usermwein@mozilla.com
push dateSat, 21 Jan 2017 03:10:58 +0000
reviewersbackout
bugs1332268
milestone53.0a1
backs out7d3e3c0a23c64491856e905c5a43550895f0dfe7
Backed out changeset 7d3e3c0a23c6 (bug 1332268) for failing own reftest component-alpha-1.html on Windows 7 debug. r=backout
gfx/layers/Compositor.cpp
layout/reftests/transform-3d/component-alpha-1-ref.html
layout/reftests/transform-3d/component-alpha-1.html
layout/reftests/transform-3d/reftest.list
--- a/gfx/layers/Compositor.cpp
+++ b/gfx/layers/Compositor.cpp
@@ -337,18 +337,17 @@ Compositor::DrawPolygon(const gfx::Polyg
     texturedTriangle.width = aRect.width;
     texturedTriangle.height = aRect.height;
 
     // Since the texture was created for non-split geometry, we need to
     // update the texture coordinates to account for the split.
     const EffectTypes type = aEffectChain.mPrimaryEffect->mType;
 
     if (type == EffectTypes::RGB || type == EffectTypes::YCBCR ||
-        type == EffectTypes::NV12 || type == EffectTypes::RENDER_TARGET ||
-        type == EffectTypes::COMPONENT_ALPHA) {
+        type == EffectTypes::NV12 || type == EffectTypes::RENDER_TARGET) {
       TexturedEffect* texturedEffect =
         static_cast<TexturedEffect*>(aEffectChain.mPrimaryEffect.get());
 
       UpdateTextureCoordinates(texturedTriangle, aRect, intersection,
                                texturedEffect->mTextureCoords);
     }
 
     texturedTriangles.AppendElement(Move(texturedTriangle));
deleted file mode 100644
--- a/layout/reftests/transform-3d/component-alpha-1-ref.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<title>red box</title>
-<style>
-
-#wrapper {
-}
-
-#shape {
-  background-color: red;
-
-  width: 200px;
-  height: 200px;
-}
-</style>
-
-</head>
-<body>
-<div id="wrapper">
-  <div id="shape">foo</div>
-</div>
-
-</body>
-</html>
deleted file mode 100644
--- a/layout/reftests/transform-3d/component-alpha-1.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<meta charset="utf-8">
-<title>red box</title>
-<style>
-
-#wrapper {
-  perspective: 0px;
-}
-
-#shape {
-  background-color: red;
-
-  width: 200px;
-  height: 200px;
-
-  transform: rotateX(0deg);
-}
-</style>
-
-</head>
-<body>
-<div id="wrapper">
-  <div id="shape">foo</div>
-</div>
-
-</body>
-</html>
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -79,9 +79,8 @@ fuzzy(1,10000) == opacity-preserve3d-3.h
 fuzzy(1,10000) == opacity-preserve3d-4.html opacity-preserve3d-4-ref.html
 == snap-perspective-1.html snap-perspective-1-ref.html
 == mask-layer-1.html mask-layer-ref.html
 == mask-layer-2.html mask-layer-ref.html
 == mask-layer-3.html mask-layer-ref.html
 fails-if(winWidget&&layersGPUAccelerated) == split-intersect1.html split-intersect1-ref.html # Bug 1323791: implement DirectX compositor polygon support
 fuzzy(255,150) fails-if(winWidget&&layersGPUAccelerated) == split-intersect2.html split-intersect2-ref.html # Bug 1323791
 fuzzy(255,100) fails-if(winWidget&&layersGPUAccelerated) == split-non-ortho1.html split-non-ortho1-ref.html # Bug 1323791
-== component-alpha-1.html component-alpha-1-ref.html