diff options
| author | Patrick Scott <phanna@android.com> | 2009-09-24 10:54:01 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-09-24 10:56:22 -0400 |
| commit | 28e09963cd0ab02a20ddd0b687e55f97921445cc (patch) | |
| tree | 99a1b6b95064e0574df34e97a7cdfd477d67a4e2 /WebKit | |
| parent | 2c02e355bf0631c0bec3496fab67f45710c5cd21 (diff) | |
| download | external_webkit-28e09963cd0ab02a20ddd0b687e55f97921445cc.zip external_webkit-28e09963cd0ab02a20ddd0b687e55f97921445cc.tar.gz external_webkit-28e09963cd0ab02a20ddd0b687e55f97921445cc.tar.bz2 | |
Add ANDROID_USER_GESTURE back to WebCore.
We only care about the user gesture during a location change. Add the
m_userGesture field to our ResourceRequest and check the value in
canHandleRequest. This could be cleaner if WebCore passed around the
ResourceRequest rather than constructing a new one.
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 2d5c3f0..bb59b73 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -634,7 +634,7 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request) if (equalIgnoringCase(request.httpMethod(), "POST")) return true; WebCore::KURL requestUrl = request.url(); - if (!mUserInitiatedClick && + if (!mUserInitiatedClick && !request.getUserGesture() && (requestUrl.protocolIs("http") || requestUrl.protocolIs("https") || requestUrl.protocolIs("file") || requestUrl.protocolIs("about") || requestUrl.protocolIs("javascript"))) |