diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/bindings/generic | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/bindings/generic')
-rw-r--r-- | Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp | 9 | ||||
-rw-r--r-- | Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h | 20 |
2 files changed, 19 insertions, 10 deletions
diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp index dadcc1c..14e4ac8 100644 --- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp +++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp @@ -69,6 +69,15 @@ bool RuntimeEnabledFeatures::fileSystemEnabled() } #endif +#if ENABLE(JAVASCRIPT_I18N_API) +bool RuntimeEnabledFeatures::isJavaScriptI18NAPIEnabled = false; + +bool RuntimeEnabledFeatures::javaScriptI18NAPIEnabled() +{ + return isJavaScriptI18NAPIEnabled; +} +#endif + #if ENABLE(VIDEO) bool RuntimeEnabledFeatures::audioEnabled() diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h index c1b9b8a..4f9a21e 100644 --- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h +++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h @@ -97,17 +97,8 @@ public: static bool webkitAudioContextEnabled() { return isWebAudioEnabled; } #endif -#if ENABLE(3D_CANVAS) || ENABLE(BLOB) +#if ENABLE(WEBGL) || ENABLE(BLOB) 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 float32ArrayEnabled() { return isWebGLEnabled; } - static bool dataViewEnabled() { return isWebGLEnabled; } static bool webGLRenderingContextEnabled() { return isWebGLEnabled; } static bool webGLArrayBufferEnabled() { return isWebGLEnabled; } static bool webGLByteArrayEnabled() { return isWebGLEnabled; } @@ -169,6 +160,11 @@ public: static void setFileSystemEnabled(bool isEnabled) { isFileSystemEnabled = isEnabled; } #endif +#if ENABLE(JAVASCRIPT_I18N_API) + static bool javaScriptI18NAPIEnabled(); + static void setJavaScriptI18NAPIEnabled(bool isEnabled) { isJavaScriptI18NAPIEnabled = isEnabled; } +#endif + private: // Never instantiate. RuntimeEnabledFeatures() { } @@ -193,6 +189,10 @@ private: #if ENABLE(FILE_SYSTEM) static bool isFileSystemEnabled; #endif + +#if ENABLE(JAVASCRIPT_I18N_API) + static bool isJavaScriptI18NAPIEnabled; +#endif }; } // namespace WebCore |