diff options
-rw-r--r-- | WebCore/Android.v8bindings.mk | 3 | ||||
-rw-r--r-- | WebCore/bindings/generic/RuntimeEnabledFeatures.cpp | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 0cd65d3..3b53c23 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -43,6 +43,8 @@ BINDING_C_INCLUDES := \ LOCAL_SRC_FILES += \ bindings/ScriptControllerBase.cpp \ \ + bindings/generic/RuntimeEnabledFeatures.cpp \ + \ bindings/v8/ChildThreadDOMData.cpp \ bindings/v8/DateExtension.cpp \ bindings/v8/DOMData.cpp \ @@ -51,7 +53,6 @@ LOCAL_SRC_FILES += \ bindings/v8/IsolatedWorld.cpp \ bindings/v8/MainThreadDOMData.cpp \ bindings/v8/NPV8Object.cpp \ - bindings/v8/RuntimeEnabledFeatures.cpp \ bindings/v8/ScheduledAction.cpp \ bindings/v8/ScopedDOMDataStore.cpp \ bindings/v8/ScriptArray.cpp \ 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) |