Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e59e301c authored by Mangesh Ghiware's avatar Mangesh Ghiware
Browse files

Update fix to restore view and text wrap scales. 

Fixes bug 5544556: All email content is wrapped prematurely.

Previous change (I5a22dd20) didn't take a few other cases of
mViewScale>0 into account.

Change-Id: I4f9578f3558f026c472492ac07d19004416dc228
parent b419abca

core/java/android/webkit/WebViewCore.java

+9 −3
Original line number Diff line number Diff line
@@ -2416,7 +2416,11 @@ public final class WebViewCore { 
        if (mIsRestored) {

            mInitialViewState.mIsRestored = true;

            mInitialViewState.mViewScale = mRestoredScale;

            if (mRestoredTextWrapScale > 0) {

                mInitialViewState.mTextWrapScale = mRestoredTextWrapScale;

            } else {

                mInitialViewState.mTextWrapScale = mInitialViewState.mViewScale;

            }

        } else {

            if (mViewportInitialScale > 0) {

                mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =
@@ -2535,11 +2539,13 @@ public final class WebViewCore { 
    // called by JNI

    private void restoreScale(float scale, float textWrapScale) {

        if (mBrowserFrame.firstLayoutDone() == false) {

            mIsRestored = true;

            mIsRestored = scale > 0;

            mRestoredScale = scale;

            if (mSettings.getUseWideViewPort()) {

                mRestoredTextWrapScale = textWrapScale;

            }

        }

    }



    // called by JNI

    private void needTouchEvents(boolean need) {

core/java/android/webkit/ZoomManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ class ZoomManager { 
            float scale;

            if (mInitialScale > 0) {

                scale = mInitialScale;

            } else if (viewState.mIsRestored) {

            } else if (viewState.mIsRestored || viewState.mViewScale > 0) {

                scale = (viewState.mViewScale > 0)

                    ? viewState.mViewScale : overviewScale;

                mTextWrapScale = (viewState.mTextWrapScale > 0)