diff options
| author | Steve Block <steveblock@google.com> | 2011-08-31 06:23:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-31 06:23:18 -0700 |
| commit | 24a08199b7204cfa19c1f61d93ea8df86d3bb99f (patch) | |
| tree | b82ee6f27a90c756aded85f735bdac71e580787a /Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | |
| parent | 12b77e280bad970089c6ef32e247a39a13e36057 (diff) | |
| parent | 5498351dca14a6380ef3174a0afa0bb950b92d68 (diff) | |
| download | external_webkit-24a08199b7204cfa19c1f61d93ea8df86d3bb99f.zip external_webkit-24a08199b7204cfa19c1f61d93ea8df86d3bb99f.tar.gz external_webkit-24a08199b7204cfa19c1f61d93ea8df86d3bb99f.tar.bz2 | |
Merge "Make sure WebViewClient.onPageStarted() doesn't preceed WebViewClient.shouldOverrideUrlLoading()"
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 11 |
1 files changed, 6 insertions, 5 deletions
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, |