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

Commit 83a40e8e authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev 

* commit '2611f1ec':
  Copy over the scroll position for the scrolling layer
parents f7fbb801 2611f1ec

core/java/android/webkit/WebViewClassic.java

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

        if (mNativeClass == 0)

            return;

            return;

        boolean queueFull;

        boolean queueFull;

        final int scrollingLayer = (mTouchMode == TOUCH_DRAG_LAYER_MODE)

                ? mCurrentScrollingLayerId : 0;

        queueFull = nativeSetBaseLayer(mNativeClass, layer,

        queueFull = nativeSetBaseLayer(mNativeClass, layer,

                                       showVisualIndicator, isPictureAfterFirstLayout);

                                       showVisualIndicator, isPictureAfterFirstLayout,

                                       scrollingLayer);





        if (queueFull) {

        if (queueFull) {

            mWebViewCore.pauseWebKitDraw();

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

    private native String   nativeGetSelection();

    private native void     nativeSetHeightCanMeasure(boolean measure);

    private native void     nativeSetHeightCanMeasure(boolean measure);

    private native boolean  nativeSetBaseLayer(int nativeInstance,

    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 int      nativeGetBaseLayer(int nativeInstance);

    private native void     nativeCopyBaseContentToPicture(Picture pict);

    private native void     nativeCopyBaseContentToPicture(Picture pict);

    private native boolean  nativeHasContent();

    private native boolean  nativeHasContent();