summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-12-16 10:48:40 +0000
committerBen Murdoch <benm@google.com>2012-01-04 13:50:32 +0000
commit5d1753b7f757cd7a2776ddb3852d8765273868a4 (patch)
tree942ab153fb1cde32f117c84667187000d215684f
parent599c05f3080acd1c99f4d925c333d8a2711c9bdf (diff)
downloadexternal_webkit-5d1753b7f757cd7a2776ddb3852d8765273868a4.zip
external_webkit-5d1753b7f757cd7a2776ddb3852d8765273868a4.tar.gz
external_webkit-5d1753b7f757cd7a2776ddb3852d8765273868a4.tar.bz2
Enable History API. Do not merge.
Cherry pick Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3 The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ib7374e0145c581588990baec6e67025c1b7ef693
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 839c352..b998e99 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -101,6 +101,7 @@
#include "RenderThemeAndroid.h"
#include "RenderView.h"
#include "ResourceRequest.h"
+#include "RuntimeEnabledFeatures.h"
#include "SchemeRegistry.h"
#include "SelectionController.h"
#include "Settings.h"
@@ -472,6 +473,12 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
// initialisation.
v8::V8::Initialize();
#endif
+
+ // Configure any RuntimeEnabled features that we need to change from their default now.
+ // See WebCore/bindings/generic/RuntimeEnabledFeatures.h
+
+ // HTML5 History API
+ RuntimeEnabledFeatures::setPushStateEnabled(true);
}
WebViewCore::~WebViewCore()