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

am f53c1865: Don\'t snap the initialScale to min or max if it is not defined.

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

* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
  Don't snap the initialScale to min or max if it is not defined.
This commit is contained in:
Grace Kloba
2009-09-22 09:22:51 -07:00
committed by Android Git Automerger
parent 91115fd698 f53c186524
commit 5136e72601
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/webkit/WebViewCore.java
View File

@@ -1867,19 +1867,13 @@ final class WebViewCore {
mViewportMinimumScale = WebView.DEFAULT_SCALE_PERCENT; mViewportMinimumScale = WebView.DEFAULT_SCALE_PERCENT;
mViewportMaximumScale = WebView.DEFAULT_SCALE_PERCENT; mViewportMaximumScale = WebView.DEFAULT_SCALE_PERCENT;
} }
if (mViewportMinimumScale > mViewportInitialScale) { if (mViewportMinimumScale > mViewportInitialScale
if (mViewportInitialScale == 0) { && mViewportInitialScale != 0) {
mViewportInitialScale = mViewportMinimumScale; mViewportMinimumScale = mViewportInitialScale;
} else {
mViewportMinimumScale = mViewportInitialScale;
}
} }
if (mViewportMaximumScale > 0) { if (mViewportMaximumScale > 0
if (mViewportMaximumScale < mViewportInitialScale) { && mViewportMaximumScale < mViewportInitialScale) {
mViewportMaximumScale = mViewportInitialScale; mViewportMaximumScale = mViewportInitialScale;
} else if (mViewportInitialScale == 0) {
mViewportInitialScale = mViewportMaximumScale;
}
} }
if (mViewportWidth < 0 if (mViewportWidth < 0
&& mViewportInitialScale == WebView.DEFAULT_SCALE_PERCENT) { && mViewportInitialScale == WebView.DEFAULT_SCALE_PERCENT) {