am f8e99204: am b215726a: Merge "Remove transient and unnecessary update density message." into jb-dev

* commit 'f8e99204c901d1d05960ed9a11c6af4a4e7dccd8':
  Remove transient and unnecessary update density message.

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 8d518a1a0f9e..bf696fe4b27f 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2551,6 +2551,11 @@ public final class WebViewCore {
             adjust = (float) mContext.getResources().getDisplayMetrics().densityDpi
                     / mViewportDensityDpi;
         }
+        // Remove any update density messages in flight.
+        // If the density is indeed different from WebView's default scale,
+        // a new message will be queued.
+        mWebViewClassic.mPrivateHandler.removeMessages(
+                WebViewClassic.UPDATE_ZOOM_DENSITY);
         if (adjust != mWebViewClassic.getDefaultZoomScale()) {
             Message.obtain(mWebViewClassic.mPrivateHandler,
                     WebViewClassic.UPDATE_ZOOM_DENSITY, adjust).sendToTarget();