diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebKit/chromium/src/WebRuntimeFeatures.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebKit/chromium/src/WebRuntimeFeatures.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebRuntimeFeatures.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp index f6478e4ba..03129c54d 100644 --- a/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp +++ b/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp @@ -278,18 +278,11 @@ bool WebRuntimeFeatures::isScriptedSpeechEnabled() void WebRuntimeFeatures::enableXHRResponseBlob(bool enable) { -#if ENABLE(XHR_RESPONSE_BLOB) - RuntimeEnabledFeatures::setXHRResponseBlobEnabled(enable); -#endif } bool WebRuntimeFeatures::isXHRResponseBlobEnabled() { -#if ENABLE(XHR_RESPONSE_BLOB) - return RuntimeEnabledFeatures::xhrResponseBlobEnabled(); -#else - return false; -#endif + return true; } void WebRuntimeFeatures::enableFileSystem(bool enable) @@ -397,7 +390,7 @@ bool WebRuntimeFeatures::isFullScreenAPIEnabled() void WebRuntimeFeatures::enablePointerLock(bool enable) { #if ENABLE(POINTER_LOCK) - RuntimeEnabledFeatures::setWebkitPointerLockEnabled(enable); + RuntimeEnabledFeatures::setPointerLockEnabled(enable); #else UNUSED_PARAM(enable); #endif @@ -406,7 +399,7 @@ void WebRuntimeFeatures::enablePointerLock(bool enable) bool WebRuntimeFeatures::isPointerLockEnabled() { #if ENABLE(POINTER_LOCK) - return RuntimeEnabledFeatures::webkitPointerLockEnabled(); + return RuntimeEnabledFeatures::pointerLockEnabled(); #else return false; #endif |