diff options
| author | John Reck <jreck@google.com> | 2012-05-25 15:56:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 15:56:48 -0700 |
| commit | 83a40e8e64bc0ee96b3339fc281b313bf2520ca5 (patch) | |
| tree | e0cede616245e31333cd054d0cefbeac764e2923 /core/java/android/webkit/WebViewClassic.java | |
| parent | f7fbb801c9dcfd5cf2af8be8614f8d1a61c76c58 (diff) | |
| parent | 2611f1eced80db74d07563e03bb99a146aa461b6 (diff) | |
am 2611f1ec: am 7cbe6457: Merge "Copy over the scroll position for the scrolling layer" into jb-dev
* commit '2611f1eced80db74d07563e03bb99a146aa461b6':
Copy over the scroll position for the scrolling layer
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 578eb2b018a7..67654da7facf 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -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(); @@ -8552,7 +8555,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(); |