summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/jni/WebCoreFrameBridge.cpp6
-rw-r--r--Source/WebKit/android/nav/WebView.cpp7
2 files changed, 0 insertions, 13 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())
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index c1cb95c..95c560d 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2608,11 +2608,6 @@ static bool nativeScrollLayer(JNIEnv* env, jobject obj, jint layerId, jint x,
return false;
}
-static void nativeSetExpandedTileBounds(JNIEnv*, jobject, jboolean enabled)
-{
- TilesManager::instance()->setExpandedTileBounds(enabled);
-}
-
static void nativeUseHardwareAccelSkia(JNIEnv*, jobject, jboolean enabled)
{
BaseRenderer::setCurrentRendererType(enabled ? BaseRenderer::Ganesh : BaseRenderer::Raster);
@@ -2827,8 +2822,6 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeScrollableLayer },
{ "nativeScrollLayer", "(III)Z",
(void*) nativeScrollLayer },
- { "nativeSetExpandedTileBounds", "(Z)V",
- (void*) nativeSetExpandedTileBounds },
{ "nativeUseHardwareAccelSkia", "(Z)V",
(void*) nativeUseHardwareAccelSkia },
{ "nativeGetBackgroundColor", "()I",