summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2012-06-06 08:32:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-06 08:32:36 -0700
commitb215726a0e46400c8dbc4a585c2f4200c7a619b6 (patch)
treea3cdac19872b9866a3537eee2665822113499813
parentf6452d0cac64b72005af330411b5a895f0038312 (diff)
parentc7ad10201bfd72c83baab270c4a59a25ca7cab0b (diff)
downloadframeworks_base-b215726a0e46400c8dbc4a585c2f4200c7a619b6.zip
frameworks_base-b215726a0e46400c8dbc4a585c2f4200c7a619b6.tar.gz
frameworks_base-b215726a0e46400c8dbc4a585c2f4200c7a619b6.tar.bz2
Merge "Remove transient and unnecessary update density message." into jb-dev
-rw-r--r--core/java/android/webkit/WebViewCore.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 1164649..728ddbf 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2550,6 +2550,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();