diff options
| author | Bart Sears <bsears@google.com> | 2012-01-04 13:49:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-04 13:49:35 -0800 |
| commit | 00efa06c5dfaed2d9054aaf9cd5c048a80d4b148 (patch) | |
| tree | 0876b5edf0ebbfb2d6f46c88e6ef447d01f03547 | |
| parent | 0d647bc28cc93eef51ec61acd0bb6e445eb2c276 (diff) | |
| parent | f62e398f3b87d76e44d18441fa090c18dcc8be82 (diff) | |
| download | external_webkit-00efa06c5dfaed2d9054aaf9cd5c048a80d4b148.zip external_webkit-00efa06c5dfaed2d9054aaf9cd5c048a80d4b148.tar.gz external_webkit-00efa06c5dfaed2d9054aaf9cd5c048a80d4b148.tar.bz2 | |
am f62e398f: Merge "Enable History API. Do not merge." into ics-mr1
* commit 'f62e398f3b87d76e44d18441fa090c18dcc8be82':
Enable History API. Do not merge.
| -rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 7 |
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() |