Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7cbe645730286eb7e5ff7339ce8c6a2ee181f2eb':
  Copy over the scroll position for the scrolling layer
This commit is contained in:
John Reck
2012-05-25 15:51:58 -07:00
committed by Android Git Automerger
parent 7d16bf4085 7cbe645730
commit 2611f1eced
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebViewClassic.java
View File

@@ -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();