diff options
| author | 2011-12-12 03:13:46 -0800 | |
|---|---|---|
| committer | 2011-12-12 03:13:46 -0800 | |
| commit | 2ff8cc2438866f791d8fe888573b5fba103e2cd0 (patch) | |
| tree | b76603a6cbb31c44db9f37ae0c2c27cd6568e5a0 | |
| parent | 130f62ab014ad95e6dc03ff219a581c8b93c82e4 (diff) | |
| parent | a62b9632c84ecfdffec2753f52ceaec2f7598139 (diff) | |
Merge "Clear the WebView picture when a new load starts."
| -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 14da23ec6628..de4949c73724 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: |