Merge change 5413 into donut

* changes: Need to write the correct float math.
2009-06-25 14:44:38 -07:00
parent eb3ec64a6a 2b2e9d9152
commit 157601594f
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -1562,7 +1562,7 @@ final class WebViewCore {

        // adjust the default scale to match the density
        if (WebView.DEFAULT_SCALE_PERCENT != 100) {
-            float adjust = WebView.DEFAULT_SCALE_PERCENT / 100;
+            float adjust = (float) WebView.DEFAULT_SCALE_PERCENT / 100.0f;
            if (mViewportInitialScale > 0) {
                mViewportInitialScale *= adjust;
            }