Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout 1383ac50bcff (bug 723484) for remote image & occasional 'load failed: null' in reftest reference case

Browse Source
This commit is contained in:
Daniel Holbert 2012-03-20 10:22:53 -07:00
parent 7c3e3c5d25
commit 6301c79b71
5 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/layers/d3d9/LayerManagerD3D9Shaders.h
View File

@ -485,8 +485,8 @@ const BYTE ComponentPass2ShaderPS[] =
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)
@ -536,11 +536,11 @@ const BYTE RGBShaderPS[] =
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

4
gfx/layers/d3d9/LayerManagerD3D9Shaders.hlsl
View File

@ -84,9 +84,9 @@ float4 RGBAShader(const VS_OUTPUT aVertex) : COLOR
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

6
layout/reftests/bugs/723484-1-ref.html
View File

@ -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>

13
layout/reftests/bugs/723484-1.html
View File

@ -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>

1
layout/reftests/bugs/reftest.list
View File

@ -1693,7 +1693,6 @@ needs-focus != 703186-1.html 703186-2.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