diff options
| author | John Reck <jreck@google.com> | 2012-09-27 16:31:15 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-09-27 17:10:49 -0700 |
| commit | 3f5a59accc76e98366ff47cf52eb766a8d7100ed (patch) | |
| tree | b17f2db0cc6b2ebd827c9c99b9dd8c742c78bee9 /core/java/android/webkit/WebViewClassic.java | |
| parent | 580ee8b0c6e1aea1e2e1d60499b603b9168b44f0 (diff) | |
Fix perf regression from scale/density mismatch
Bug: 7242941
Change-Id: I8a45e8ae589cecc6215566b995003b9eefb7827e
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 1c47615376be..d68511c45335 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1664,7 +1664,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mTouchSlopSquare = slop * slop; slop = configuration.getScaledDoubleTapSlop(); mDoubleTapSlopSquare = slop * slop; - final float density = mContext.getResources().getDisplayMetrics().density; + final float density = WebViewCore.getFixedDisplayDensity(mContext); // use one line height, 16 based on our current default font, for how // far we allow a touch be away from the edge of a link mNavSlop = (int) (16 * density); @@ -1809,7 +1809,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc } /* package */ void adjustDefaultZoomDensity(int zoomDensity) { - final float density = mContext.getResources().getDisplayMetrics().density + final float density = WebViewCore.getFixedDisplayDensity(mContext) * 100 / zoomDensity; updateDefaultZoomDensity(density); } |