[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

eric at webkit.org eric at webkit.org
Thu Apr 8 02:06:44 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit fb2bc2f179a8224ca083d908167de59b2c893059
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 19:33:54 2010 +0000

    2010-03-02  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Darin Fisher.
    
            Add EnabledAtRuntime attribute to WebGLArray constructors
            https://bugs.webkit.org/show_bug.cgi?id=35558
    
            New functionality verified manually in Chromium; not possible to
            write layout test. Ran WebGL tests in WebKit as well.
    
            * bindings/generic/RuntimeEnabledFeatures.cpp:
            * bindings/generic/RuntimeEnabledFeatures.h:
            (WebCore::RuntimeEnabledFeatures::setWebGLEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLRenderingContextEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLArrayBufferEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLByteArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLUnsignedByteArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLShortArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLUnsignedShortArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLIntArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLUnsignedIntArrayEnabled):
            (WebCore::RuntimeEnabledFeatures::webGLFloatArrayEnabled):
            * page/DOMWindow.idl:
    2010-03-02  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Darin Fisher.
    
            Add EnabledAtRuntime attribute to WebGLArray constructors
            https://bugs.webkit.org/show_bug.cgi?id=35558
    
            * public/WebRuntimeFeatures.h:
            * src/WebRuntimeFeatures.cpp:
            (WebKit::WebRuntimeFeatures::enableWebGL):
            (WebKit::WebRuntimeFeatures::isWebGLEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 325ba84..e9d9a98 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-03-02  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Add EnabledAtRuntime attribute to WebGLArray constructors
+        https://bugs.webkit.org/show_bug.cgi?id=35558
+
+        New functionality verified manually in Chromium; not possible to
+        write layout test. Ran WebGL tests in WebKit as well.
+
+        * bindings/generic/RuntimeEnabledFeatures.cpp:
+        * bindings/generic/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setWebGLEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLRenderingContextEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLArrayBufferEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLByteArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLUnsignedByteArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLShortArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLUnsignedShortArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLIntArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLUnsignedIntArrayEnabled):
+        (WebCore::RuntimeEnabledFeatures::webGLFloatArrayEnabled):
+        * page/DOMWindow.idl:
+
 2010-03-02  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 1b09518..84a1460 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -44,6 +44,7 @@ bool RuntimeEnabledFeatures::isWebkitNotificationsEnabled = false;
 bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true;
 bool RuntimeEnabledFeatures::isGeolocationEnabled = true;
 bool RuntimeEnabledFeatures::isIndexedDBEnabled = false;
+bool RuntimeEnabledFeatures::isWebGLEnabled = false;
 
 #if ENABLE(VIDEO)
 
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 6f0f78f..4541105 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -77,6 +77,19 @@ public:
     static bool openDatabaseEnabled();
 #endif
 
+#if ENABLE(3D_CANVAS)
+    static void setWebGLEnabled(bool isEnabled) { isWebGLEnabled = isEnabled; }
+    static bool webGLRenderingContextEnabled() { return isWebGLEnabled; }
+    static bool webGLArrayBufferEnabled() { return isWebGLEnabled; }
+    static bool webGLByteArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLUnsignedByteArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLShortArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLUnsignedShortArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLIntArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLUnsignedIntArrayEnabled() { return isWebGLEnabled; }
+    static bool webGLFloatArrayEnabled() { return isWebGLEnabled; }
+#endif
+
 private:
     // Never instantiate.
     RuntimeEnabledFeatures() { }
@@ -87,6 +100,7 @@ private:
     static bool isApplicationCacheEnabled;
     static bool isGeolocationEnabled;
     static bool isIndexedDBEnabled;
+    static bool isWebGLEnabled;
 };
 
 } // namespace WebCore
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 0669ac7..c757146 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -442,17 +442,17 @@ module window {
 
         attribute CanvasRenderingContext2DConstructor CanvasRenderingContext2D;
         attribute ImageDataConstructor ImageData;
-        attribute [Conditional=3D_CANVAS] WebGLRenderingContextConstructor WebGLRenderingContext;
+        attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLRenderingContextConstructor WebGLRenderingContext;
         attribute TextMetricsConstructor TextMetrics;
 
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLArrayBufferConstructor WebGLArrayBuffer; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLByteArrayConstructor WebGLByteArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLUnsignedByteArrayConstructor WebGLUnsignedByteArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLShortArrayConstructor WebGLShortArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLUnsignedShortArrayConstructor WebGLUnsignedShortArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLIntArrayConstructor WebGLIntArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLUnsignedIntArrayConstructor WebGLUnsignedIntArray; // Usable with new operator
-        attribute [JSCCustomGetter,Conditional=3D_CANVAS] WebGLFloatArrayConstructor WebGLFloatArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLArrayBufferConstructor WebGLArrayBuffer; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLByteArrayConstructor WebGLByteArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLUnsignedByteArrayConstructor WebGLUnsignedByteArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLShortArrayConstructor WebGLShortArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLUnsignedShortArrayConstructor WebGLUnsignedShortArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLIntArrayConstructor WebGLIntArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLUnsignedIntArrayConstructor WebGLUnsignedIntArray; // Usable with new operator
+        attribute [JSCCustomGetter,Conditional=3D_CANVAS,EnabledAtRuntime] WebGLFloatArrayConstructor WebGLFloatArray; // Usable with new operator
 
         attribute EventConstructor Event;
         attribute BeforeLoadEventConstructor BeforeLoadEvent;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index d26b86a..8068f70 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-02  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Darin Fisher.
+
+        Add EnabledAtRuntime attribute to WebGLArray constructors
+        https://bugs.webkit.org/show_bug.cgi?id=35558
+
+        * public/WebRuntimeFeatures.h:
+        * src/WebRuntimeFeatures.cpp:
+        (WebKit::WebRuntimeFeatures::enableWebGL):
+        (WebKit::WebRuntimeFeatures::isWebGLEnabled):
+
 2010-03-02  James Hawkins  <jhawkins at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebRuntimeFeatures.h b/WebKit/chromium/public/WebRuntimeFeatures.h
index 04f88c9..0e6ccec 100644
--- a/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -68,6 +68,9 @@ public:
     WEBKIT_API static void enableIndexedDatabase(bool);
     WEBKIT_API static bool isIndexedDatabaseEnabled();
 
+    WEBKIT_API static void enableWebGL(bool);
+    WEBKIT_API static bool isWebGLEnabled();
+
 private:
     WebRuntimeFeatures();
 };
diff --git a/WebKit/chromium/src/WebRuntimeFeatures.cpp b/WebKit/chromium/src/WebRuntimeFeatures.cpp
index ad84764..79ee2e1 100644
--- a/WebKit/chromium/src/WebRuntimeFeatures.cpp
+++ b/WebKit/chromium/src/WebRuntimeFeatures.cpp
@@ -184,4 +184,20 @@ bool WebRuntimeFeatures::isIndexedDatabaseEnabled()
 #endif
 }
 
+void WebRuntimeFeatures::enableWebGL(bool enable)
+{
+#if ENABLE(3D_CANVAS)
+    RuntimeEnabledFeatures::setWebGLEnabled(enable);
+#endif
+}
+
+bool WebRuntimeFeatures::isWebGLEnabled()
+{
+#if ENABLE(3D_CANVAS)
+    return RuntimeEnabledFeatures::webGLRenderingContextEnabled();
+#else
+    return false;
+#endif
+}
+
 } // namespace WebKit

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list