Backed out changeset a58d895d8197 (bug 645792) for OSX leaks.

This commit is contained in:
Ryan VanderMeulen 2013-08-29 13:46:10 -04:00
parent b47e5f0731
commit c8c1dbcab7
4 changed files with 9 additions and 7 deletions

View File

@ -66,8 +66,9 @@
MochiKit.DOM.addLoadEvent(function () {
var canvas = document.getElementById("canvas");
gl = canvas.getContext("experimental-webgl");
if (!gl) {
try {
gl = canvas.getContext("experimental-webgl");
} catch (e) {
todo(false, "Canvas WebGL not supported");
SimpleTest.finish();
return;

View File

@ -804,7 +804,6 @@ HTMLCanvasElement::GetContext(JSContext* aCx,
rv = UpdateContext(aCx, aContextOptions);
if (rv.Failed()) {
rv = NS_OK; // See bug 645792
return nullptr;
}
mCurrentContextId.Assign(aContextId);

View File

@ -16,8 +16,9 @@
function testInt64NonFinite(arg) {
// We can use a WebGLRenderingContext to test conversion to 64-bit signed
// ints edge cases.
var gl = $("c").getContext("experimental-webgl");
if (!gl) {
try {
var gl = $("c").getContext("experimental-webgl");
} catch (ex) {
// No WebGL support on MacOS 10.5. Just skip this test
todo(false, "WebGL not supported");
return;

View File

@ -20,8 +20,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=775852
/** Test for Bug 775852 **/
function doTest() {
var gl = $("c").getContext("experimental-webgl");
if (!gl) {
try {
var gl = $("c").getContext("experimental-webgl");
} catch (e) {
// No WebGL support on MacOS 10.5. Just skip this test
todo(false, "WebGL not supported");
return;