summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni/WebCoreFrameBridge.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-08-25 12:41:57 +0100
committerSteve Block <steveblock@google.com>2011-08-31 14:21:59 +0100
commit5498351dca14a6380ef3174a0afa0bb950b92d68 (patch)
tree99de5978348aa4b62d01cb3443af1b3abacd1de4 /Source/WebKit/android/jni/WebCoreFrameBridge.h
parentb489cd197be0a820a768f5bafacac9b6cd9cbb1c (diff)
downloadexternal_webkit-5498351dca14a6380ef3174a0afa0bb950b92d68.zip
external_webkit-5498351dca14a6380ef3174a0afa0bb950b92d68.tar.gz
external_webkit-5498351dca14a6380ef3174a0afa0bb950b92d68.tar.bz2
Make sure WebViewClient.onPageStarted() doesn't preceed WebViewClient.shouldOverrideUrlLoading()
In the case of a server-side redirect, we were triggering a callback to WebViewClient.onPageStarted() before we'd called WebViewClient.shouldOverrideUrlLoading(). This change delays calling WebViewClient.onPageStarted() until after WebViewClient.shouldOverrideUrlLoading() has returned and has indicated that the WebView should continue with the load. Bug: 5191031 Change-Id: I43d12c4df46e5d6e2defad10e80efbf0d5c30aed
Diffstat (limited to 'Source/WebKit/android/jni/WebCoreFrameBridge.h')
-rw-r--r--Source/WebKit/android/jni/WebCoreFrameBridge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h
index 99ca459..e49bf35 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.h
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h
@@ -99,6 +99,8 @@ class WebFrame : public WebCoreRefObject {
void updateVisitedHistory(const WebCore::KURL& url, bool reload);
+ // Used to determine whether the WebView should handle the given request.
+ // Returns true if it should handle it, otherwise false.
virtual bool canHandleRequest(const WebCore::ResourceRequest& request);
WebCore::Frame* createWindow(bool dialog, bool userGesture);