drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep initial zoom overview for non-standard load.

Browse Source 
In case of non-standard load such as reload, currently the ZoomManager's
onFirstLayout will not be triggered, hence initial zoom overview will not
be set.

This change provides a fix to set initial zoom overview in case of
non-standard load for the new picture after first layout.

issue: 4975315
Change-Id: If2ba3e472f2bb7b6fc4c52024d18a66dc1e41a23
This commit is contained in:
Shimeng (Simon) Wang
2011-06-30 13:36:53 -07:00
parent be768ee508
commit 72a1d2e138
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1950,6 +1950,7 @@ public final class WebViewCore {
// mInitialViewState is set by didFirstLayout() and then reset in the
// next webkitDraw after passing the state to the UI thread.
private ViewState mInitialViewState = null;
private boolean mFirstLayoutForNonStandardLoad;
static class ViewState {
float mMinScale;
@ -1977,6 +1978,7 @@ public final class WebViewCore {
int mMinPrefWidth;
// only non-null if it is for the first picture set after the first layout
ViewState mViewState;
boolean mFirstLayoutForNonStandardLoad;
boolean mFocusSizeChanged;
}
@ -2026,6 +2028,10 @@ public final class WebViewCore {
draw.mViewState = mInitialViewState;
mInitialViewState = null;
}
if (mFirstLayoutForNonStandardLoad) {
draw.mFirstLayoutForNonStandardLoad = true;
mFirstLayoutForNonStandardLoad = false;
}
if (DebugFlags.WEB_VIEW_CORE) Log.v(LOGTAG, "webkitDraw NEW_PICTURE_MSG_ID");
Message.obtain(mWebView.mPrivateHandler,
WebView.NEW_PICTURE_MSG_ID, draw).sendToTarget();
@ -2312,6 +2318,8 @@ public final class WebViewCore {
// if mViewportWidth is 0, it means device-width, always update.
if (mViewportWidth != 0 && !updateViewState) {
// For non standard load, since updateViewState will be false.
mFirstLayoutForNonStandardLoad = true;
ViewState viewState = new ViewState();
viewState.mMinScale = mViewportMinimumScale / 100.0f;
viewState.mMaxScale = mViewportMaximumScale / 100.0f;

5
core/java/android/webkit/ZoomManager.java
View File

@ -1024,6 +1024,11 @@ class ZoomManager {
} else {
mInZoomOverview = !scaleHasDiff;
}
if (drawData.mFirstLayoutForNonStandardLoad && settings.getLoadWithOverviewMode()) {
// Set mInitialZoomOverview in case this is the first picture for non standard load,
// so next new picture could be forced into overview mode if it's true.
mInitialZoomOverview = mInZoomOverview;
}
}
/**