diff options
| author | John Reck <jreck@google.com> | 2012-09-28 00:36:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-28 00:36:49 -0700 |
| commit | b3c8ddade471c2676bf3e2c854ec6c5dbcdc24f2 (patch) | |
| tree | 0f2c4202c401aaa1303990d6aaea21bfee7e6f04 /core/java/android/webkit/WebViewClassic.java | |
| parent | 342ee73b65dd45773243ea744196af99534c83c2 (diff) | |
| parent | 93f7d42deb07bdbbc6cc0724247d6efce1f5a3e2 (diff) | |
am 93f7d42d: am 7c72a8f9: Merge "Fix perf regression from scale/density mismatch" into jb-mr1-dev
* commit '93f7d42deb07bdbbc6cc0724247d6efce1f5a3e2':
Fix perf regression from scale/density mismatch
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 620538074b49..047c7fa27d3a 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); } |