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

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

Merge "Copy over the scroll position for the scrolling layer" into jb-dev

parents e2417b7a ec1b71ad

core/java/android/webkit/WebViewClassic.java

+6 −2
Original line number Diff line number Diff line
@@ -4403,8 +4403,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
        if (mNativeClass == 0)

            return;

        boolean queueFull;

        final int scrollingLayer = (mTouchMode == TOUCH_DRAG_LAYER_MODE)

                ? mCurrentScrollingLayerId : 0;

        queueFull = nativeSetBaseLayer(mNativeClass, layer,

                                       showVisualIndicator, isPictureAfterFirstLayout);

                                       showVisualIndicator, isPictureAfterFirstLayout,

                                       scrollingLayer);



        if (queueFull) {

            mWebViewCore.pauseWebKitDraw();
@@ -8515,7 +8518,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc 
    private native String   nativeGetSelection();

    private native void     nativeSetHeightCanMeasure(boolean measure);

    private native boolean  nativeSetBaseLayer(int nativeInstance,

            int layer, boolean showVisualIndicator, boolean isPictureAfterFirstLayout);

            int layer, boolean showVisualIndicator, boolean isPictureAfterFirstLayout,

            int scrollingLayer);

    private native int      nativeGetBaseLayer(int nativeInstance);

    private native void     nativeCopyBaseContentToPicture(Picture pict);

    private native boolean  nativeHasContent();