Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b82665e7: don\'t allow min scale to go to infinity

Browse Source 
Merge commit 'b82665e78f3a4f08e7b620b85246b7925097386b' into eclair-plus-aosp

* commit 'b82665e78f3a4f08e7b620b85246b7925097386b':
  don't allow min scale to go to infinity
This commit is contained in:
Cary Clark
2009-09-23 10:19:21 -07:00
committed by Android Git Automerger
parent ea2aabf1b2 b82665e78f
commit 3c385116e9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebView.java
View File

@@ -4868,7 +4868,8 @@ public class WebView extends AbsoluteLayout
mLastScale = restoreState.mTextWrapScale; mLastScale = restoreState.mTextWrapScale;
if (restoreState.mMinScale == 0) { if (restoreState.mMinScale == 0) {
if (restoreState.mMobileSite) { if (restoreState.mMobileSite) {
if (draw.mMinPrefWidth > draw.mViewPoint.x) { if (draw.mMinPrefWidth >
Math.max(0, draw.mViewPoint.x)) {
mMinZoomScale = (float) viewWidth mMinZoomScale = (float) viewWidth
/ draw.mMinPrefWidth; / draw.mMinPrefWidth;
mMinZoomScaleFixed = false; mMinZoomScaleFixed = false;