Merge "Post a full WebView inval when we navigate to a new page."

2 files changed, 5 insertions, 5 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 31eed62..3134a44 100644
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -919,6 +919,10 @@ void FrameLoaderClientAndroid::transitionToCommittedFromCachedFrame(WebCore::Cac
 #ifdef ANDROID_META_SUPPORT
    platformData->restoreMetadata(m_frame->settings());
 #endif
+   WebViewCore* webViewCore = WebViewCore::getWebViewCore(m_frame->view());
+
+   webViewCore->clearContent();
+
    m_webFrame->transitionToCommitted(m_frame);
 }
 
@@ -952,6 +956,7 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() {
 
     // Create a new WebFrameView for the new FrameView
     WebFrameView* newFrameView = new WebFrameView(m_frame->view(), webViewCore);
+    webViewCore->clearContent();
     newFrameView->setLocation(bounds.x(), bounds.y());
     newFrameView->setSize(bounds.width(), bounds.height());
     newFrameView->setVisibleSize(visBounds.width(), visBounds.height());
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
index f243b09..46499b1 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1479,11 +1479,6 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url, jobject headers)
     }
     LOGV("LoadUrl %s", kurl.string().latin1().data());
     pFrame->loader()->load(request, false);
-
-    // Loading a new URL, clear the picture set.
-    WebCore::FrameView* view = pFrame->view();
-    if (view)
-        WebViewCore::getWebViewCore(view)->clearContent();
 }
 
 static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData)