зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 505e8f8480d2 (bug 913597) for Android failure
--HG-- extra : rebase_source : d9ffe836559fb5a63d895d40b4f89324c2932216
This commit is contained in:
Родитель
9a8d14b011
Коммит
2a71172f41
|
@ -5,6 +5,5 @@
|
|||
|
||||
MOCHITEST_FILES = \
|
||||
test_webgl_conformance.html \
|
||||
test_webgl_request_context.html \
|
||||
test_webgl_request_mismatch.html \
|
||||
$(NULL)
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
<!DOCTYPE HTML>
|
||||
<title>WebGL test: 'webgl' and 'experimental-webgl' context requests succeed,
|
||||
'moz-webgl' context requests fail.</title>
|
||||
<script src="/MochiKit/MochiKit.js"></script>
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" href="/tests/SimpleTest/test.css">
|
||||
<body>
|
||||
<canvas id="c1"></canvas>
|
||||
<canvas id="c2"></canvas>
|
||||
<canvas id="c3"></canvas>
|
||||
<script>
|
||||
|
||||
function testContextRetrieval(canvasId, creationId, shouldSucceed) {
|
||||
var canvas = document.getElementById(canvasId);
|
||||
ok(canvas, 'Invalid `canvasId`: ' + canvasId);
|
||||
|
||||
var createdGL = canvas.getContext(creationId);
|
||||
if (shouldSucceed) {
|
||||
ok(createdGL, 'Request for \'' + creationId + '\' should succeed.');
|
||||
} else {
|
||||
ok(!createdGL, 'Request for \'' + creationId + '\' should fail.');
|
||||
}
|
||||
}
|
||||
|
||||
testContextRetrieval('c1', 'experimental-webgl', true);
|
||||
testContextRetrieval('c2', 'webgl', true);
|
||||
testContextRetrieval('c3', 'moz-webgl', false);
|
||||
|
||||
</script>
|
||||
|
|
@ -772,7 +772,8 @@ static bool
|
|||
IsContextIdWebGL(const nsAString& str)
|
||||
{
|
||||
return str.EqualsLiteral("webgl") ||
|
||||
str.EqualsLiteral("experimental-webgl");
|
||||
str.EqualsLiteral("experimental-webgl") ||
|
||||
str.EqualsLiteral("moz-webgl");
|
||||
}
|
||||
|
||||
already_AddRefed<nsISupports>
|
||||
|
|
|
@ -1134,6 +1134,7 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
|
|||
{ "@mozilla.org/content/post-content-iterator;1", &kNS_CONTENTITERATOR_CID },
|
||||
{ "@mozilla.org/content/pre-content-iterator;1", &kNS_PRECONTENTITERATOR_CID },
|
||||
{ "@mozilla.org/content/subtree-content-iterator;1", &kNS_SUBTREEITERATOR_CID },
|
||||
{ "@mozilla.org/content/canvas-rendering-context;1?id=moz-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
|
||||
{ "@mozilla.org/content/canvas-rendering-context;1?id=experimental-webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
|
||||
#ifdef MOZ_WEBGL_CONFORMANT
|
||||
{ "@mozilla.org/content/canvas-rendering-context;1?id=webgl", &kNS_CANVASRENDERINGCONTEXTWEBGL_CID },
|
||||
|
|
Загрузка…
Ссылка в новой задаче