diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2011-10-13 09:02:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-13 09:02:01 -0700 |
| commit | afc13c28806a857b0dd5996c83a90d23796f4257 (patch) | |
| tree | 33d901b36d7d33f8814e52a20ec8824dc7967ed5 /Source | |
| parent | 4600714fcda05a5a4355fa7bd1d502b69c8147b6 (diff) | |
| parent | 0557c56c5b00819cf14bf29948b6d9edd1e937f2 (diff) | |
| download | external_webkit-afc13c28806a857b0dd5996c83a90d23796f4257.zip external_webkit-afc13c28806a857b0dd5996c83a90d23796f4257.tar.gz external_webkit-afc13c28806a857b0dd5996c83a90d23796f4257.tar.bz2 | |
am 0557c56c: Merge "Fix disappearing content" into ics-mr0
* commit '0557c56c5b00819cf14bf29948b6d9edd1e937f2':
Fix disappearing content
Diffstat (limited to 'Source')
| -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()); |