diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-10-13 09:00:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 09:00:06 -0700 |
| commit | 0557c56c5b00819cf14bf29948b6d9edd1e937f2 (patch) | |
| tree | f4bfbfbc61599b50962aa98baf50a33c72e42f60 /Source/WebKit | |
| parent | 9bd214662e776fb18e43d1ad32ce274803ec309a (diff) | |
| parent | 69ae8c4ecaffcbc20d4b251a6e831ac6c4e58f30 (diff) | |
| download | external_webkit-0557c56c5b00819cf14bf29948b6d9edd1e937f2.zip external_webkit-0557c56c5b00819cf14bf29948b6d9edd1e937f2.tar.gz external_webkit-0557c56c5b00819cf14bf29948b6d9edd1e937f2.tar.bz2 | |
Merge "Fix disappearing content" into ics-mr0
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp index 3134a44..0be31eb 100644 --- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp @@ -919,9 +919,13 @@ void FrameLoaderClientAndroid::transitionToCommittedFromCachedFrame(WebCore::Cac #ifdef ANDROID_META_SUPPORT platformData->restoreMetadata(m_frame->settings()); #endif + +#if ENABLE(ANDROID_OVERFLOW_SCROLL) +#else WebViewCore* webViewCore = WebViewCore::getWebViewCore(m_frame->view()); webViewCore->clearContent(); +#endif m_webFrame->transitionToCommitted(m_frame); } @@ -956,7 +960,12 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() { // Create a new WebFrameView for the new FrameView WebFrameView* newFrameView = new WebFrameView(m_frame->view(), webViewCore); + +#if ENABLE(ANDROID_OVERFLOW_SCROLL) +#else webViewCore->clearContent(); +#endif + newFrameView->setLocation(bounds.x(), bounds.y()); newFrameView->setSize(bounds.width(), bounds.height()); newFrameView->setVisibleSize(visBounds.width(), visBounds.height()); |