Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

2 files changed, 15 insertions, 0 deletions

diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 2044a20..a3e488e 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -32,6 +32,7 @@
 #include "RuntimeEnabledFeatures.h"
 
 #include "Database.h"
+#include "DatabaseSync.h"
 #include "MediaPlayer.h"
 #include "SharedWorkerRepository.h"
 #include "WebSocket.h"
@@ -96,6 +97,11 @@ bool RuntimeEnabledFeatures::openDatabaseEnabled()
 {
     return Database::isAvailable();
 }
+
+bool RuntimeEnabledFeatures::openDatabaseSyncEnabled()
+{
+    return DatabaseSync::isAvailable();
+}
 #endif
 
 } // namespace WebCore
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 1534353..c84465a 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -75,10 +75,19 @@ public:
 
 #if ENABLE(DATABASE)
     static bool openDatabaseEnabled();
+    static bool openDatabaseSyncEnabled();
 #endif
 
 #if ENABLE(3D_CANVAS)
     static void setWebGLEnabled(bool isEnabled) { isWebGLEnabled = isEnabled; }
+    static bool arrayBufferEnabled() { return isWebGLEnabled; }
+    static bool int8ArrayEnabled() { return isWebGLEnabled; }
+    static bool uint8ArrayEnabled() { return isWebGLEnabled; }
+    static bool int16ArrayEnabled() { return isWebGLEnabled; }
+    static bool uint16ArrayEnabled() { return isWebGLEnabled; }
+    static bool int32ArrayEnabled() { return isWebGLEnabled; }
+    static bool uint32ArrayEnabled() { return isWebGLEnabled; }
+    static bool floatArrayEnabled() { return isWebGLEnabled; }
     static bool webGLRenderingContextEnabled() { return isWebGLEnabled; }
     static bool webGLArrayBufferEnabled() { return isWebGLEnabled; }
     static bool webGLByteArrayEnabled() { return isWebGLEnabled; }