diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/bindings/generic | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/bindings/generic')
-rw-r--r-- | Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h | 36 |
2 files changed, 19 insertions, 23 deletions
diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp index 14e4ac8..e9591fd 100644 --- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp +++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp @@ -46,16 +46,20 @@ bool RuntimeEnabledFeatures::isLocalStorageEnabled = true; bool RuntimeEnabledFeatures::isSessionStorageEnabled = true; bool RuntimeEnabledFeatures::isWebkitNotificationsEnabled = false; bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true; +bool RuntimeEnabledFeatures::isDataTransferItemsEnabled = true; bool RuntimeEnabledFeatures::isGeolocationEnabled = true; bool RuntimeEnabledFeatures::isIndexedDBEnabled = false; bool RuntimeEnabledFeatures::isWebAudioEnabled = false; -bool RuntimeEnabledFeatures::isWebGLEnabled = false; bool RuntimeEnabledFeatures::isPushStateEnabled = false; bool RuntimeEnabledFeatures::isTouchEnabled = true; bool RuntimeEnabledFeatures::isDeviceMotionEnabled = true; bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true; bool RuntimeEnabledFeatures::isSpeechInputEnabled = true; +#if ENABLE(MEDIA_STREAM) +bool RuntimeEnabledFeatures::isMediaStreamEnabled = true; +#endif + #if ENABLE(XHR_RESPONSE_BLOB) bool RuntimeEnabledFeatures::isXHRResponseBlobEnabled = false; #endif diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h index 7e21214..1004ea4 100644 --- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h +++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h @@ -51,6 +51,9 @@ public: static void setApplicationCacheEnabled(bool isEnabled) { isApplicationCacheEnabled = isEnabled; } static bool applicationCacheEnabled() { return isApplicationCacheEnabled; } + static void setDataTransferItemsEnabled(bool isEnabled) { isDataTransferItemsEnabled = isEnabled; } + static bool dataTransferItemsEnabled() { return isDataTransferItemsEnabled; } + static void setGeolocationEnabled(bool isEnabled) { isGeolocationEnabled = isEnabled; } static bool geolocationEnabled() { return isGeolocationEnabled; } @@ -94,27 +97,6 @@ public: static bool webkitAudioContextEnabled() { return isWebAudioEnabled; } #endif -#if ENABLE(WEBGL) || ENABLE(BLOB) - 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; } - static bool webGLActiveInfoEnabled() { return isWebGLEnabled; } - static bool webGLBufferEnabled() { return isWebGLEnabled; } - static bool webGLFramebufferEnabled() { return isWebGLEnabled; } - static bool webGLProgramEnabled() { return isWebGLEnabled; } - static bool webGLRenderbufferEnabled() { return isWebGLEnabled; } - static bool webGLShaderEnabled() { return isWebGLEnabled; } - static bool webGLTextureEnabled() { return isWebGLEnabled; } - static bool webGLUniformLocationEnabled() { return isWebGLEnabled; } -#endif - static void setPushStateEnabled(bool isEnabled) { isPushStateEnabled = isEnabled; } static bool pushStateEnabled() { return isPushStateEnabled; } static bool replaceStateEnabled() { return isPushStateEnabled; } @@ -162,6 +144,12 @@ public: static void setJavaScriptI18NAPIEnabled(bool isEnabled) { isJavaScriptI18NAPIEnabled = isEnabled; } #endif +#if ENABLE(MEDIA_STREAM) + static bool mediaStreamEnabled() { return isMediaStreamEnabled; } + static void setMediaStreamEnabled(bool isEnabled) { isMediaStreamEnabled = isEnabled; } + static bool webkitGetUserMediaEnabled() { return isMediaStreamEnabled; } +#endif + private: // Never instantiate. RuntimeEnabledFeatures() { } @@ -170,10 +158,10 @@ private: static bool isSessionStorageEnabled; static bool isWebkitNotificationsEnabled; static bool isApplicationCacheEnabled; + static bool isDataTransferItemsEnabled; static bool isGeolocationEnabled; static bool isIndexedDBEnabled; static bool isWebAudioEnabled; - static bool isWebGLEnabled; static bool isPushStateEnabled; static bool isTouchEnabled; static bool isDeviceMotionEnabled; @@ -190,6 +178,10 @@ private: #if ENABLE(JAVASCRIPT_I18N_API) static bool isJavaScriptI18NAPIEnabled; #endif + +#if ENABLE(MEDIA_STREAM) + static bool isMediaStreamEnabled; +#endif }; } // namespace WebCore |