Merge "DO NOT MERGE" into eclair

2010-01-14 19:29:09 -08:00
parent d1019a99f9 fd787ba79d
commit 4d69ac6695
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5206,7 +5206,8 @@ public class WebView extends AbsoluteLayout
                        if (Math.abs((viewWidth * mInvActualScale)
                                - mZoomOverviewWidth) > 1) {
                            setNewZoomScale((float) viewWidth
-                                    / mZoomOverviewWidth, true, false);
+                                    / mZoomOverviewWidth, Math.abs(mActualScale
+                                            - mTextWrapScale) < 0.01f, false);
                        }
                    }
                    break;