2011-05-25 Gregg Tavares <gman@chromium.org>

        Reviewed by Kenneth Russell.

        Add 'noExtensions' option to Web/GraphicsContext3D attributes.
        https://bugs.webkit.org/show_bug.cgi?id=61460

        * Source/WebCore/html/canvas/WebGLRenderingContext.cpp:
        * Source/WebCore/platform/graphics/GraphicsContext3D.h:
        * Source/WebKit/chromium/public/WebGraphicsContext3D.h:
        * Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 0e03f5f..13856bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-25  Gregg Tavares  <gman@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Add 'noExtensions' option to Web/GraphicsContext3D attributes.
+        https://bugs.webkit.org/show_bug.cgi?id=61460
+
+        * Source/WebCore/html/canvas/WebGLRenderingContext.cpp:
+        * Source/WebCore/platform/graphics/GraphicsContext3D.h:
+        * Source/WebKit/chromium/public/WebGraphicsContext3D.h:
+        * Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp:
+
 2011-05-24  Keishi Hattori  <keishi@webkit.org>
 
         Reviewed by Kent Tamura.

diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index 619d969..5a9dc48 100644 (file)
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -369,6 +369,7 @@ PassOwnPtr<WebGLRenderingContext> WebGLRenderingContext::create(HTMLCanvasElemen
             attributes.antialias = false;
     }
 
+    attributes.noExtensions = true;
     RefPtr<GraphicsContext3D> context(GraphicsContext3D::create(attributes, hostWindow));
 
     if (!context) {

diff --git a/Source/WebCore/platform/graphics/GraphicsContext3D.h b/Source/WebCore/platform/graphics/GraphicsContext3D.h
index 208a51b..14e7107 100644 (file)
--- a/Source/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/Source/WebCore/platform/graphics/GraphicsContext3D.h
@@ -427,6 +427,7 @@ public:
             , premultipliedAlpha(true)
             , canRecoverFromContextLoss(true)
             , preserveDrawingBuffer(false)
+            , noExtensions(false)
         {
         }
 
@@ -437,6 +438,7 @@ public:
         bool premultipliedAlpha;
         bool canRecoverFromContextLoss;
         bool preserveDrawingBuffer;
+        bool noExtensions;
     };
 
     enum RenderStyle {

diff --git a/Source/WebKit/chromium/public/WebGraphicsContext3D.h b/Source/WebKit/chromium/public/WebGraphicsContext3D.h
index 3de72c2..b58575c 100644 (file)
--- a/Source/WebKit/chromium/public/WebGraphicsContext3D.h
+++ b/Source/WebKit/chromium/public/WebGraphicsContext3D.h
@@ -85,6 +85,7 @@ public:
             , antialias(true)
             , premultipliedAlpha(true)
             , canRecoverFromContextLoss(true)
+            , noExtensions(false)
         {
         }
 
@@ -94,6 +95,7 @@ public:
         bool antialias;
         bool premultipliedAlpha;
         bool canRecoverFromContextLoss;
+        bool noExtensions;
     };
 
     class WebGraphicsContextLostCallback {

diff --git a/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp b/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
index 540db1c..ebca978 100644 (file)
--- a/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
+++ b/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
@@ -109,6 +109,7 @@ bool GraphicsContext3DInternal::initialize(GraphicsContext3D::Attributes attrs,
     webAttributes.antialias = attrs.antialias;
     webAttributes.premultipliedAlpha = attrs.premultipliedAlpha;
     webAttributes.canRecoverFromContextLoss = attrs.canRecoverFromContextLoss;
+    webAttributes.noExtensions = attrs.noExtensions;
     OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::webKitClient()->createGraphicsContext3D());
     if (!webContext)
         return false;