Changeset 146795 in webkit

Timestamp:

Mar 25, 2013, 12:05:57 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Enabled canvas.getContext("webgl") on Desktop Chrome
​https://bugs.webkit.org/show_bug.cgi?id=113079

Patch by Brandon Jones <​bajones@chromium.org> on 2013-03-25
Reviewed by Dean Jackson.

Test: fast/canvas/webgl/webgl-unprefixed-context-id.html

• bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:

(WebCore::V8HTMLCanvasElement::getContextMethodCustom):

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::getContext):

Location:

trunk

Files:

• LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id-expected.txt (added)
• LayoutTests/fast/canvas/webgl/webgl-unprefixed-context-id.html (added)
• LayoutTests/platform/chromium/fast/canvas/webgl/webgl-unprefixed-context-id-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-25  Brandon Jones  <bajones@chromium.org>
+
+        Enabled canvas.getContext("webgl") on Desktop Chrome
+        https://bugs.webkit.org/show_bug.cgi?id=113079
+
+        Reviewed by Dean Jackson.
+
+        Test: fast/canvas/webgl/webgl-unprefixed-context-id.html
+
+        * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
+        (WebCore::V8HTMLCanvasElement::getContextMethodCustom):
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+
 2013-03-25  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp

@@ -56 +56 @@
     RefPtr<CanvasContextAttributes> attrs;
 #if ENABLE(WEBGL)
-    if (contextId == "experimental-webgl" || contextId == "webkit-3d") {
+    if (contextId == "webgl" || contextId == "experimental-webgl" || contextId == "webkit-3d") {
         attrs = WebGLContextAttributes::create();
         WebGLContextAttributes* webGLAttrs = static_cast<WebGLContextAttributes*>(attrs.get());

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -194 +194 @@
 #endif
         ) {
+
         // Accept the legacy "webkit-3d" name as well as the provisional "experimental-webgl" name.
-        // Once ratified, we will also accept "webgl" as the context name.
-        if ((type == "webkit-3d") ||
-            (type == "experimental-webgl")) {
+        bool is3dContext = (type == "webkit-3d") || (type == "experimental-webgl");
+
+#if PLATFORM(CHROMIUM) && !OS(ANDROID)
+        // Now that WebGL is ratified, we will also accept "webgl" as the context name in Chrome.
+        is3dContext |= (type == "webgl");
+#endif
+
+        if (is3dContext) {
             if (m_context && !m_context->is3d())
                 return 0;