summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-08-17 15:39:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-17 15:39:35 -0700
commitb3676d1d75c8159c6cf8621ef840e7694685efd7 (patch)
tree41f3436112432d622f65410716803c80c8c91afe /Source/WebKit
parentbd7e9ea6769039d66b97b4286e096416b53bdc4a (diff)
parentadb6a5b9615e20edca8bd133e830720af2e2afa1 (diff)
downloadexternal_webkit-b3676d1d75c8159c6cf8621ef840e7694685efd7.zip
external_webkit-b3676d1d75c8159c6cf8621ef840e7694685efd7.tar.gz
external_webkit-b3676d1d75c8159c6cf8621ef840e7694685efd7.tar.bz2
Merge "Remove shouldOverrideUrlLoading restrictions"
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/jni/WebCoreFrameBridge.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index afc251b..5fbe0a1 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -843,12 +843,6 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request)
if (equalIgnoringCase(request.httpMethod(), "POST"))
return true;
const WebCore::KURL& requestUrl = request.url();
- bool isUserGesture = UserGestureIndicator::processingUserGesture();
- if (!mUserInitiatedAction && !isUserGesture &&
- (requestUrl.protocolIs("http") || requestUrl.protocolIs("https") ||
- requestUrl.protocolIs("file") || requestUrl.protocolIs("about") ||
- WebCore::protocolIsJavaScript(requestUrl.string())))
- return true;
const WTF::String& url = requestUrl.string();
// Empty urls should not be sent to java
if (url.isEmpty())