summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/ZoomManager.java
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2011-02-18 09:31:59 -0800
committerShimeng (Simon) Wang <swang@google.com>2011-02-18 09:31:59 -0800
commita05fa96834d74b195fe8e26ca412d5bf7e7f66dc (patch)
tree1d9dcd96ced5f4d677d95e7526c2405d87c69245 /core/java/android/webkit/ZoomManager.java
parent459c42395648193bb13ed8a4bcf5c58af9cac3c5 (diff)
downloadframeworks_base-a05fa96834d74b195fe8e26ca412d5bf7e7f66dc.zip
frameworks_base-a05fa96834d74b195fe8e26ca412d5bf7e7f66dc.tar.gz
frameworks_base-a05fa96834d74b195fe8e26ca412d5bf7e7f66dc.tar.bz2
Make sure zoom width is changed before fit-to-screen.
issue: 3466509 Change-Id: I7cdb9544fcb3f261ebd0a831ab4a5cd685c5fc77
Diffstat (limited to 'core/java/android/webkit/ZoomManager.java')
-rw-r--r--core/java/android/webkit/ZoomManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index d7a6a53..86aef4c 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -890,7 +890,7 @@ class ZoomManager {
!exceedsMinScaleIncrement(newZoomOverviewScale, 1.0f);
if (!mWebView.drawHistory() &&
(mInitialZoomOverview || scaleLessThanOverview || mobileSiteInOverview) &&
- scaleHasDiff) {
+ scaleHasDiff && zoomOverviewWidthChanged) {
mInitialZoomOverview = false;
setZoomScale(newZoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&
!mWebView.getSettings().getUseFixedViewport());