diff options
author | Patrick Scott <phanna@android.com> | 2009-06-22 14:16:36 -0400 |
---|---|---|
committer | Patrick Scott <phanna@android.com> | 2009-06-22 14:16:36 -0400 |
commit | 8b69ec781c68f4bbaccf6245ef1d562eed206be8 (patch) | |
tree | 20d6d05ea4dbc25633421f240823c22866e4bcc0 /WebKit/android/jni | |
parent | 263a3894c3719057dcbd85b9094eba072da13511 (diff) | |
download | external_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.zip external_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.tar.gz external_webkit-8b69ec781c68f4bbaccf6245ef1d562eed206be8.tar.bz2 |
Remove ANDROID_USER_GESTURE as the bug it fixed no longer applies.
I tested the original bug and found that without this change, the link works
perfectly fine. The only thing that does not work with this change is redirects
within iframes that are to non-http protocols. This is ok since iframes can
always change the parent window's location if this is the desired behavior.
Diffstat (limited to 'WebKit/android/jni')
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 091417b..3e55693 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -584,17 +584,11 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request) #ifdef ANDROID_INSTRUMENT TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter); #endif - // Internal loads are ok but any request that is due to a user hitting a key - // should be checked. - bool userGesture = false; -#ifdef ANDROID_USER_GESTURE - userGesture = request.userGesture(); -#endif // always handle "POST" in place if (equalIgnoringCase(request.httpMethod(), "POST")) return true; WebCore::KURL requestUrl = request.url(); - if (!mUserInitiatedClick && !userGesture && + if (!mUserInitiatedClick && (requestUrl.protocolIs("http") || requestUrl.protocolIs("https") || requestUrl.protocolIs("file") || requestUrl.protocolIs("about") || requestUrl.protocolIs("javascript"))) |