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

Backed out 3 changesets (bug 1087560) for bustage

Browse Source 
Backed out changeset ecf4df03029a (bug 1087560)
Backed out changeset 12a016a84d6d (bug 1087560)
Backed out changeset 1b8b46616028 (bug 1087560)
This commit is contained in:
Wes Kocher 2014-10-27 21:59:43 -07:00
parent c979af4660
commit 903b8fb20a
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/canvas/WebGLContext.cpp
View File

@ -1252,10 +1252,12 @@ WebGLContext::GetContextAttributes(Nullable<dom::WebGLContextAttributes> &retval
dom::WebGLContextAttributes& result = retval.SetValue();
result.mAlpha.Construct(mOptions.alpha);
result.mDepth = mOptions.depth;
result.mStencil = mOptions.stencil;
result.mAntialias = mOptions.antialias;
const PixelBufferFormat& format = gl->GetPixelFormat();
result.mAlpha.Construct(format.alpha > 0);
result.mDepth = format.depth > 0;
result.mStencil = format.stencil > 0;
result.mAntialias = format.samples > 1;
result.mPremultipliedAlpha = mOptions.premultipliedAlpha;
result.mPreserveDrawingBuffer = mOptions.preserveDrawingBuffer;
}

4
dom/canvas/test/webgl-mochitest.ini
View File

@ -3,12 +3,12 @@ support-files =
webgl-mochitest/driver-info.js
webgl-mochitest/webgl-util.js
[webgl-mochitest/test_backbuffer_channels.html]
[webgl-mochitest/test-backbuffer-channels.html]
[webgl-mochitest/test-hidden-alpha.html]
[webgl-mochitest/test_depth_readpixels.html]
[webgl-mochitest/test_draw.html]
[webgl-mochitest/test_fb_param.html]
[webgl-mochitest/test_fb_param_crash.html]
[webgl-mochitest/test_hidden_alpha.html]
[webgl-mochitest/test_highp_fs.html]
[webgl-mochitest/test_no_arr_points.html]
[webgl-mochitest/test_noprog_draw.html]

5
dom/canvas/test/webgl-mochitest/mochi-to-testcase.py
View File

@ -48,11 +48,6 @@ function todo(val, text) {
: 'Test <font color=\\'blue\\' >todo</font>: ';
debug(status + text);
}
SimpleTest = {
waitForExplicitFinish: function() {},
finish: function() {},
};
</script>
<div id='mochi-to-testcase-output'></div>
\n'''

2
dom/canvas/test/webgl-mochitest/test_backbuffer_channels.html → dom/canvas/test/webgl-mochitest/test-backbuffer-channels.html
View File

@ -8,7 +8,7 @@
<script>
function TestAttribs(attribs) {
ok(true, 'Testing attribs: ' + JSON.stringify(attribs));
debug('Testing attribs: ' + JSON.stringify(attribs));
var canvas = document.createElement('canvas');
var gl = canvas.getContext('experimental-webgl', attribs);
ok(gl, 'No tested attribs should result in failure to create a context');

6
dom/canvas/test/webgl-mochitest/test_hidden_alpha.html → dom/canvas/test/webgl-mochitest/test-hidden-alpha.html
View File

@ -77,7 +77,7 @@ function Test(gl, prog) {
//////////////////
ok(true, 'clear(R,G,B,0)');
debug('clear(R,G,B,0)');
Reset(gl);
@ -102,7 +102,7 @@ function Test(gl, prog) {
//////////////////
ok(true, 'mask(R,G,B,0), clear(R,G,B,1)');
debug('mask(R,G,B,0), clear(R,G,B,1)');
Reset(gl);
@ -129,7 +129,6 @@ function Test(gl, prog) {
'toDataURL should be unchanged after blending.');
ok(true, 'Test complete.');
SimpleTest.finish();
}
(function(){
@ -147,7 +146,6 @@ function Test(gl, prog) {
ok(prog, 'Program should link.');
prog.aPosCoord = gl.getAttribLocation(prog, 'aPosCoord');
SimpleTest.waitForExplicitFinish();
setTimeout(function(){ Test(gl, prog); }, 500);
})();