diff options
| author | 2011-12-05 14:51:00 +0000 | |
|---|---|---|
| committer | 2011-12-07 14:16:31 +0000 | |
| commit | a62b9632c84ecfdffec2753f52ceaec2f7598139 (patch) | |
| tree | 7cda5f3fe6c3aa3ef497cf138ccee8d715139244 | |
| parent | b808af7daf74d27d3c745cd6d62007f344d37e53 (diff) | |
Clear the WebView picture when a new load starts.
Clear the old picture set when we have confirmed a new
page load.
Bug: 5701197
Change-Id: Id96fb7d8e75a0b54a448d35239a69ba1774cffae
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index c1945599d337..d8f08b2977b6 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -410,6 +410,7 @@ class BrowserFrame extends Handler { mCommitted = false; // remove pending draw to block update until mFirstLayoutDone is // set to true in didFirstLayout() + mWebViewCore.clearContent(); mWebViewCore.removeMessages(WebViewCore.EventHub.WEBKIT_DRAW); } } diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 0f749bcd6be2..6cbcb47ccea7 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -497,6 +497,13 @@ public final class WebViewCore { message.sendToTarget(); } + /** + * Clear the picture set. To be called only on the WebCore thread. + */ + /* package */ void clearContent() { + nativeClearContent(); + } + //------------------------------------------------------------------------- // JNI methods //------------------------------------------------------------------------- @@ -1560,7 +1567,7 @@ public final class WebViewCore { // Clear the view so that onDraw() will draw nothing // but white background // (See public method WebView.clearView) - nativeClearContent(); + clearContent(); break; case MESSAGE_RELAY: |