diff options
| author | Cary Clark <cary@android.com> | 2009-09-23 12:49:28 -0400 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2009-09-23 13:09:34 -0400 |
| commit | b82665e78f3a4f08e7b620b85246b7925097386b (patch) | |
| tree | 9e5eb516f0c7dbef5455adea119619a38fb0df61 /core | |
| parent | c28e3a670fd993d5465504ed48e9e89bb24823b0 (diff) | |
| download | frameworks_base-b82665e78f3a4f08e7b620b85246b7925097386b.zip frameworks_base-b82665e78f3a4f08e7b620b85246b7925097386b.tar.gz frameworks_base-b82665e78f3a4f08e7b620b85246b7925097386b.tar.bz2 | |
don't allow min scale to go to infinity
When a new picture is received, the min zoom scale is set.
One of the many choices divides by draw.mMinPrefWidth, even
if it is zero. Add a check to require it to be greater than
zero before using it as a ratio component.
fixes http://b/issue?id=2138786
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index a3e692e..8c63692 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4868,7 +4868,8 @@ public class WebView extends AbsoluteLayout mLastScale = restoreState.mTextWrapScale; if (restoreState.mMinScale == 0) { if (restoreState.mMobileSite) { - if (draw.mMinPrefWidth > draw.mViewPoint.x) { + if (draw.mMinPrefWidth > + Math.max(0, draw.mViewPoint.x)) { mMinZoomScale = (float) viewWidth / draw.mMinPrefWidth; mMinZoomScaleFixed = false; |