Fix disappearing content

When we fixed the superfluous contentInvalidateAll() that was called
every time we were scrolling/zooming, this uncover some issues.
This particular one was clearing the entire pictureset when an iframe
was loaded -- this is wrong since we added support for composited
iframes, but we didn't experience this problem before because of the
contentInvalidateAll() masking it...

bug:5449492
Change-Id: I57e4ea68daf6de901118725f5b7d70087084f23b

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());