backout of 6bad6cd2dded due to failure of test it added (a=backout-orange)
authorMike Shaver <shaver@mozilla.org>
Sat, 19 Feb 2011 11:08:39 -0800
changeset 62867 61c6c43d9630a4496d65e03d0f83f24c231b70c5
parent 62866 4ae4b97f392bafd1fb8e7d6651f1c00da902db4d
child 62868 36b58f89446d9c5a8fecd9ee8bc30aa6aabd2ffd
push idunknown
push userunknown
push dateunknown
reviewersbackout-orange
milestone2.0b12pre
backs out6bad6cd2dded7db460b76377552e359d2a4eefb9
backout of 6bad6cd2dded due to failure of test it added (a=backout-orange)
gfx/layers/opengl/ContainerLayerOGL.cpp
layout/reftests/bugs/635302-1-ref.html
layout/reftests/bugs/635302-1.html
layout/reftests/bugs/reftest.list
--- a/gfx/layers/opengl/ContainerLayerOGL.cpp
+++ b/gfx/layers/opengl/ContainerLayerOGL.cpp
@@ -329,17 +329,17 @@ ContainerRender(Container* aContainer,
       // 2DRect case, get the multiplier right for a sampler2DRect
       float f[] = { float(visibleRect.width), float(visibleRect.height) };
       rgb->SetUniform(rgb->GetTexCoordMultiplierUniformLocation(),
                       2, f);
     }
 
     DEBUG_GL_ERROR_CHECK(aContainer->gl());
 
-    aManager->BindAndDrawQuad(rgb, aContainer->gl()->IsDoubleBuffered());
+    aManager->BindAndDrawQuad(rgb, aPreviousFrameBuffer == 0);
 
     DEBUG_GL_ERROR_CHECK(aContainer->gl());
 
     // Clean up resources.  This also unbinds the texture.
     aContainer->gl()->fDeleteTextures(1, &containerSurface);
 
     DEBUG_GL_ERROR_CHECK(aContainer->gl());
   }
deleted file mode 100644
--- a/layout/reftests/bugs/635302-1-ref.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<style>
-#outer {
-    opacity: 0.8;
-    background-color:red;
-    width: 200px;
-}
-
-#inner {
-    opacity: 0.5;
-    background-color:blue;
-    color:white;
-}
-
-</style>
-</head>
-<body>
-  <div id="outer">
-    <div style="width:200px; height:200px; background:black;"></div>
-    <div id="inner">
-      <div style="width:200px; height:200px; background:black;"></div>
-      <div style="width:200px; height:200px; background:green;"></div>
-    </div>
-  </div>
-</body></html>
deleted file mode 100644
--- a/layout/reftests/bugs/635302-1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<style>
-#outer {
-    opacity: 0.8;
-    background-color:red;
-    width: 200px;
-}
-
-#inner {
-    opacity: 0.5;
-    background-color:blue;
-    color:white;
-}
-
-</style>
-</head>
-<body>
-  <div id="outer">
-    <canvas width="200" height="200" style="display:block;" id="c1"></canvas>
-    <div id="inner">
-      <canvas width="200" height="400" style="display:block;" id="c2"></canvas>
-    </div>
-  </div>
-
-
-<script>
-var ctx = document.getElementById("c1").getContext("2d");
-ctx.fillStyle = "black";
-ctx.fillRect(0, 0, 200, 200);
-var ctx = document.getElementById("c2").getContext("2d");
-ctx.fillStyle = "black";
-ctx.fillRect(0, 0, 200, 200);
-ctx.fillStyle = "green";
-ctx.fillRect(0, 200, 200, 200);
-</script>
-
-</body></html>
-
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1608,9 +1608,8 @@ HTTP(..) == 621253-2-externalFilter.html
 HTTP(..) == 619511-1.html 619511-1-ref.html
 random-if(winWidget) == 621918-1.svg 621918-1-ref.svg # 1-pixel diacritic positioning discrepancy in rotated text (may depend on platform fonts)
 random-if(winWidget) HTTP(..) == 621918-2.svg 621918-2-ref.svg # same 1px issue as above, and HTTP(..) for filters.svg, used to mask antialiasing issues where glyphs touch
 == 625409-1.html 625409-1-ref.html
 == 627393-1.html about:blank
 == 631352-1.html 631352-1-ref.html
 fails-if(winWidget) == 632781-verybig.html 632781-ref.html # large canvas elements are not drawn on Windows, see bug 633936
 == 632781-normalsize.html 632781-ref.html
-== 635302-1.html 635302-1-ref.html