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/WebKit/chromium/src/WebRuntimeFeatures.cpp | |
| 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/WebKit/chromium/src/WebRuntimeFeatures.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebRuntimeFeatures.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp index 0b5d397..e3ece6e 100644 --- a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp +++ b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp @@ -202,14 +202,14 @@ bool WebRuntimeFeatures::isWebAudioEnabled() void WebRuntimeFeatures::enableWebGL(bool enable) { -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) RuntimeEnabledFeatures::setWebGLEnabled(enable); #endif } bool WebRuntimeFeatures::isWebGLEnabled() { -#if ENABLE(3D_CANVAS) +#if ENABLE(WEBGL) return RuntimeEnabledFeatures::webGLRenderingContextEnabled(); #else return false; @@ -304,4 +304,20 @@ bool WebRuntimeFeatures::isFileSystemEnabled() #endif } +void WebRuntimeFeatures::enableJavaScriptI18NAPI(bool enable) +{ +#if ENABLE(JAVASCRIPT_I18N_API) + RuntimeEnabledFeatures::setJavaScriptI18NAPIEnabled(enable); +#endif +} + +bool WebRuntimeFeatures::isJavaScriptI18NAPIEnabled() +{ +#if ENABLE(JAVASCRIPT_I18N_API) + return RuntimeEnabledFeatures::javaScriptI18NAPIEnabled(); +#else + return false; +#endif +} + } // namespace WebKit |