diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 11:40:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 11:40:26 -0700 |
| commit | 49c0406efa6c7982937774428f27d1172225119e (patch) | |
| tree | e6f0618a8d3359c592ee561eea571a9defc25071 /WebKit/android/jni | |
| parent | 461c3fcad8dc54fa3240dcc0cb8989e690408578 (diff) | |
| parent | 8b69ec781c68f4bbaccf6245ef1d562eed206be8 (diff) | |
| download | external_webkit-49c0406efa6c7982937774428f27d1172225119e.zip external_webkit-49c0406efa6c7982937774428f27d1172225119e.tar.gz external_webkit-49c0406efa6c7982937774428f27d1172225119e.tar.bz2 | |
Merge change 4941
* changes:
Remove ANDROID_USER_GESTURE as the bug it fixed no longer applies.
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"))) |