From 5498351dca14a6380ef3174a0afa0bb950b92d68 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 25 Aug 2011 12:41:57 +0100 Subject: 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 --- .../WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h') diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index e325e01..2464c58 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -229,12 +229,13 @@ namespace android { virtual void didSaveToPageCache() { } virtual void didRestoreFromPageCache() { } private: - CacheBuilder m_cacheBuilder; - Frame* m_frame; - WebFrame* m_webFrame; + CacheBuilder m_cacheBuilder; + Frame* m_frame; + WebFrame* m_webFrame; PluginManualLoader* m_manualLoader; - bool m_hasSentResponseToPlugin; - bool m_onDemandPluginsEnabled; + bool m_hasSentResponseToPlugin; + bool m_onDemandPluginsEnabled; + mutable bool m_didReceiveServerRedirect; enum ResourceErrors { InternalErrorCancelled = -99, -- cgit v1.1