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

Commit 7788c51d authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix onFirstLayout path for saved pages" into ics-mr0

parents f129988a 23a446cf

core/java/android/webkit/WebView.java

+4 −1
Original line number Diff line number Diff line
@@ -1917,6 +1917,7 @@ public class WebView extends AbsoluteLayout 
            mLoadedPicture = ViewStateSerializer.deserializeViewState(stream, this);

            mBlockWebkitViewMessages = true;

            setNewPicture(mLoadedPicture, true);

            mLoadedPicture.mViewState = null;

            return true;

        } catch (IOException e) {

            Log.w(LOGTAG, "Failed to loadViewState", e);
@@ -4355,8 +4356,10 @@ public class WebView extends AbsoluteLayout 
            selectionDone();

        }

        mOrientation = newConfig.orientation;

        if (mWebViewCore != null && !mBlockWebkitViewMessages) {

            mWebViewCore.sendMessage(EventHub.CLEAR_CONTENT);

        }

    }



    /**

     * Keep track of the Callback so we can end its ActionMode or remove its