Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations."

camaelon · Android (Google) Code Review · commit 98a5fcd895cc · 2011-10-06T18:29:20.000-07:00
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
@@ -2010,10 +2010,10 @@ private void webkitDrawLayers() {
         if (nativeUpdateLayers(mLastDrawData.mBaseLayer)) {
             // If anything more complex than position has been touched, let's do a full draw
             webkitDraw();
-        } else {
-            Message.obtain(mWebView.mPrivateHandler,
-                    WebView.INVAL_RECT_MSG_ID).sendToTarget();
         }
+        mWebView.mPrivateHandler.removeMessages(WebView.INVAL_RECT_MSG_ID);
+        mWebView.mPrivateHandler.sendMessageAtFrontOfQueue(mWebView.mPrivateHandler
+                .obtainMessage(WebView.INVAL_RECT_MSG_ID));
     }
 
     private void webkitDraw() {

Original file line number	Diff line number	Diff line change
`@@ -2010,10 +2010,10 @@ private void webkitDrawLayers() {`
`2010`	`2010`	`if (nativeUpdateLayers(mLastDrawData.mBaseLayer)) {`
`2011`	`2011`	`// If anything more complex than position has been touched, let's do a full draw`
`2012`	`2012`	`webkitDraw();`
`2013`		`- } else {`
`2014`		`- Message.obtain(mWebView.mPrivateHandler,`
`2015`		`- WebView.INVAL_RECT_MSG_ID).sendToTarget();`
`2016`	`2013`	`}`
	`2014`	`+ mWebView.mPrivateHandler.removeMessages(WebView.INVAL_RECT_MSG_ID);`
	`2015`	`+ mWebView.mPrivateHandler.sendMessageAtFrontOfQueue(mWebView.mPrivateHandler`
	`2016`	`+ .obtainMessage(WebView.INVAL_RECT_MSG_ID));`
`2017`	`2017`	`}`
`2018`	`2018`
`2019`	`2019`	`private void webkitDraw() {`