diff options
| author | Steve Block <steveblock@google.com> | 2010-02-11 14:42:22 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-16 11:48:33 +0000 |
| commit | 43396d591529f979331569892250611eb2b2e8a3 (patch) | |
| tree | 719c12668ea8fc3b22767fb3ccdaa919c1ba8f1d /WebCore/bindings | |
| parent | bbd750d5835fa1fcef2c3d076723d1305e045c39 (diff) | |
| download | external_webkit-43396d591529f979331569892250611eb2b2e8a3.zip external_webkit-43396d591529f979331569892250611eb2b2e8a3.tar.gz external_webkit-43396d591529f979331569892250611eb2b2e8a3.tar.bz2 | |
Merge webkit.org at r54731 : Update Android to reflect refactoring of RuntimeEnabledFeatures.cpp
see http://trac.webkit.org/changeset/54593
Change-Id: Iab1af86c65db24849fbdb07cc4b1692133d7ae87
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/generic/RuntimeEnabledFeatures.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp index 3fdbb6d..0fae4ff 100644 --- a/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp +++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp @@ -41,8 +41,11 @@ namespace WebCore { bool RuntimeEnabledFeatures::isLocalStorageEnabled = true; bool RuntimeEnabledFeatures::isSessionStorageEnabled = true; bool RuntimeEnabledFeatures::isWebkitNotificationsEnabled = false; -bool RuntimeEnabledFeatures::isApplicationCacheEnabled = false; -bool RuntimeEnabledFeatures::isGeolocationEnabled = false; +#if PLATFORM(ANDROID) +// These should default to true, to match the behavior with JSC +bool RuntimeEnabledFeatures::isApplicationCacheEnabled = true; +bool RuntimeEnabledFeatures::isGeolocationEnabled = true; +#endif bool RuntimeEnabledFeatures::isIndexedDBEnabled = false; #if ENABLE(VIDEO) |