backout 1383ac50bcff (bug 723484) for remote image & occasional 'load failed: null' in reftest reference case
authorDaniel Holbert <dholbert@cs.stanford.edu>
Tue, 20 Mar 2012 10:22:53 -0700
changeset 89816 4bdae514b9be7faa5630710a9bf02b52dfab0a47
parent 89815 e97da8b4b939812b4ed62901f4523a068911b141
child 89817 e02266bccdc73cb1ca5b8fab0a92f84abe782cf1
child 89888 60c19ec121f7a6413692a4ca69b2a02ba0246512
child 106001 cea47dfc3fb7a47fd12e48fd7305a703f637788c
push id22286
push usermbrubeck@mozilla.com
push dateTue, 20 Mar 2012 20:16:29 +0000
treeherdermozilla-central@4bdae514b9be [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs723484
milestone14.0a1
backs out1383ac50bcff5ee23ec13e1948635ece0cba1748
first release with
nightly linux32
4bdae514b9be / 14.0a1 / 20120321031151 / files
nightly linux64
4bdae514b9be / 14.0a1 / 20120321031151 / files
nightly mac
4bdae514b9be / 14.0a1 / 20120321031151 / files
nightly win32
4bdae514b9be / 14.0a1 / 20120321031151 / files
nightly win64
4bdae514b9be / 14.0a1 / 20120321031151 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
backout 1383ac50bcff (bug 723484) for remote image & occasional 'load failed: null' in reftest reference case
gfx/layers/d3d9/LayerManagerD3D9Shaders.h
gfx/layers/d3d9/LayerManagerD3D9Shaders.hlsl
layout/reftests/bugs/723484-1-ref.html
layout/reftests/bugs/723484-1.html
layout/reftests/bugs/reftest.list
--- a/gfx/layers/d3d9/LayerManagerD3D9Shaders.h
+++ b/gfx/layers/d3d9/LayerManagerD3D9Shaders.h
@@ -480,18 +480,18 @@ const BYTE ComponentPass2ShaderPS[] =
 //   s2D           s0       1
 //
 
     ps_2_0
     def c1, 1, 0, 0, 0
     dcl t0.xy
     dcl_2d s0
     texld r0, t0, s0
+    mul r0.xyz, r0, c0.x
     mov r0.w, c1.x
-    mul r0, r0, c0.x
     mov oC0, r0
 
 // approximately 4 instruction slots used (1 texture, 3 arithmetic)
 #endif
 
 const BYTE RGBShaderPS[] =
 {
       0,   2, 255, 255, 254, 255, 
@@ -531,21 +531,21 @@ const BYTE RGBShaderPS[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,  31,   0,   0,   2, 
       0,   0,   0, 128,   0,   0, 
       3, 176,  31,   0,   0,   2, 
       0,   0,   0, 144,   0,   8, 
      15, 160,  66,   0,   0,   3, 
       0,   0,  15, 128,   0,   0, 
     228, 176,   0,   8, 228, 160, 
-      1,   0,   0,   2,   0,   0, 
-      8, 128,   1,   0,   0, 160, 
       5,   0,   0,   3,   0,   0, 
-     15, 128,   0,   0, 228, 128, 
+      7, 128,   0,   0, 228, 128, 
       0,   0,   0, 160,   1,   0, 
+      0,   2,   0,   0,   8, 128, 
+      1,   0,   0, 160,   1,   0, 
       0,   2,   0,   8,  15, 128, 
       0,   0, 228, 128, 255, 255, 
       0,   0
 };
 #if 0
 //
 // Generated by Microsoft (R) HLSL Shader Compiler 9.29.952.3111
 //
--- a/gfx/layers/d3d9/LayerManagerD3D9Shaders.hlsl
+++ b/gfx/layers/d3d9/LayerManagerD3D9Shaders.hlsl
@@ -79,19 +79,19 @@ float4 ComponentPass2Shader(const VS_OUT
 float4 RGBAShader(const VS_OUTPUT aVertex) : COLOR
 {
   return tex2D(s2D, aVertex.vTexCoords) * fLayerOpacity;
 }
 
 float4 RGBShader(const VS_OUTPUT aVertex) : COLOR
 {
   float4 result;
-  result = tex2D(s2D, aVertex.vTexCoords);
+  result = tex2D(s2D, aVertex.vTexCoords) * fLayerOpacity;
   result.a = 1.0;
-  return result * fLayerOpacity;
+  return result;
 }
 
 float4 YCbCrShader(const VS_OUTPUT aVertex) : COLOR
 {
   float4 yuv;
   float4 color;
 
   yuv.r = tex2D(s2DCr, aVertex.vTexCoords).r - 0.5;
deleted file mode 100644
--- a/layout/reftests/bugs/723484-1-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML>  
-<html>
-<body style="background:yellow;">
-<img style="opacity:0.001" src="http://i.imgur.com/Ct8Zm.jpg">
-</body> 
-</html>
deleted file mode 100644
--- a/layout/reftests/bugs/723484-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML>  
-<html class="reftest-wait">
-<body style="background:yellow;">
-<img id="i" src="http://i.imgur.com/Ct8Zm.jpg">
-<script>
-function doTest() {
-  document.getElementById("i").style.opacity = 0.001;
-  document.documentElement.removeAttribute("class");
-}
-window.addEventListener("MozReftestInvalidate", doTest, false);
-</script> 
-</body> 
-</html>
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1688,12 +1688,11 @@ needs-focus != 703186-1.html 703186-2.ht
 == 713856-dynamic.html 713856-ref.html
 == 714519-1-as.html 714519-1-ref.html
 == 714519-1-q.html 714519-1-ref.html
 == 714519-2-as.html 714519-2-ref.html
 == 714519-2-q.html 714519-2-ref.html
 fuzzy-if(d2d,1,19) fuzzy-if(cocoaWidget,1,170) == 718521.html 718521-ref.html
 == 720987.html 720987-ref.html
 == 722923-1.html 722923-1-ref.html
-== 723484-1.html 723484-1-ref.html
 == 729143-1.html 729143-1-ref.html
 needs-focus == 731726-1.html 731726-1-ref.html
 == 735481-1.html 735481-1-ref.html