From ff05196cac4818040d85cc637467e6dcbab31cde Mon Sep 17 00:00:00 2001 From: Dan Glastonbury Date: Thu, 23 Jan 2014 00:44:16 +0900 Subject: [PATCH] Bug 913597 - Remove support for obsolete 'moz-webgl' name for creation of WebGL contexts. r=jgilbert --- .../test/webgl/non-conf-tests/mochitest.ini | 1 + .../test_webgl_request_context.html | 28 +++++++++++++++++++ .../html/content/src/HTMLCanvasElement.cpp | 3 +- layout/build/nsLayoutModule.cpp | 1 - 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html diff --git a/content/canvas/test/webgl/non-conf-tests/mochitest.ini b/content/canvas/test/webgl/non-conf-tests/mochitest.ini index d21cdc028e8f..cf5f41c5de48 100644 --- a/content/canvas/test/webgl/non-conf-tests/mochitest.ini +++ b/content/canvas/test/webgl/non-conf-tests/mochitest.ini @@ -7,4 +7,5 @@ support-files = [test_no_arr_points.html] [test_webgl_available.html] [test_webgl_conformance.html] +[test_webgl_request_context.html] [test_webgl_request_mismatch.html] diff --git a/content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html b/content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html new file mode 100644 index 000000000000..206e0234d895 --- /dev/null +++ b/content/canvas/test/webgl/non-conf-tests/test_webgl_request_context.html @@ -0,0 +1,28 @@ + +WebGL test: 'webgl' and 'experimental-webgl' context requests succeed, + 'moz-webgl' context requests fail. + + + + + + + + diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index 7c33c96a9b28..0ef8b142e904 100644 --- a/content/html/content/src/HTMLCanvasElement.cpp +++ b/content/html/content/src/HTMLCanvasElement.cpp @@ -685,8 +685,7 @@ static bool IsContextIdWebGL(const nsAString& str) { return str.EqualsLiteral("webgl") || - str.EqualsLiteral("experimental-webgl") || - str.EqualsLiteral("moz-webgl"); + str.EqualsLiteral("experimental-webgl"); } already_AddRefed diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 8070c400ffec..11e5d096824f 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -1142,7 +1142,6 @@ 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 },