diff options
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 2bc8619..24d027a 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -653,15 +653,7 @@ bool FrameLoaderClientAndroid::canHandleRequest(const ResourceRequest& request) m_frame->tree() && m_frame->tree()->parent()) return true; - if (m_webFrame->canHandleRequest(request)) { -#ifdef ANDROID_META_SUPPORT - // reset metadata settings for the top frame as they are not preserved cross page - if (!m_frame->tree()->parent() && m_frame->settings()) - m_frame->settings()->resetMetadataSettings(); -#endif - return true; - } - return false; + return m_webFrame->canHandleRequest(request); } bool FrameLoaderClientAndroid::canShowMIMEType(const String& mimeType) const { @@ -782,6 +774,13 @@ void FrameLoaderClientAndroid::transitionToCommittedFromCachedFrame(WebCore::Cac void FrameLoaderClientAndroid::transitionToCommittedForNewPage() { ASSERT(m_frame); + +#ifdef ANDROID_META_SUPPORT + // reset metadata settings for the main frame as they are not preserved cross page + if (m_frame == m_frame->page()->mainFrame() && m_frame->settings()) + m_frame->settings()->resetMetadataSettings(); +#endif + if (m_frame->settings() && !m_frame->settings()->usesPageCache()) { m_webFrame->transitionToCommitted(m_frame); return; |