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

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

Browse Source 
Merge commit '3c385116e98e6812813049206cb85417f1bccb21'

* commit '3c385116e98e6812813049206cb85417f1bccb21':
  don't allow min scale to go to infinity
This commit is contained in:
Cary Clark
2009-09-25 08:50:44 -07:00
committed by Android Git Automerger
parent 0b4263a2ed 3c385116e9
commit db9eaad8eb
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;
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;