From 4695e20aa50845ccb8470b4fcd74229503d81d49 Mon Sep 17 00:00:00 2001 From: Michael Kolb Date: Fri, 13 Jan 2012 16:15:11 -0800 Subject: fix layer scrollbar updates Bug: 5868791 tell webkit the layer has been scrolled Change-Id: Ib12963340d950be992fbe5f9520c9a33c04404e8 --- core/java/android/webkit/WebView.java | 2 ++ core/java/android/webkit/WebViewCore.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 168baad7c9fb..ab4665a96fe5 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3742,6 +3742,8 @@ public class WebView extends AbsoluteLayout nativeScrollLayer(mCurrentScrollingLayerId, x, y); mScrollingLayerRect.left = x; mScrollingLayerRect.top = y; + mWebViewCore.sendMessage(WebViewCore.EventHub.SCROLL_LAYER, mCurrentScrollingLayerId, + mScrollingLayerRect); onScrollChanged(mScrollX, mScrollY, mScrollX, mScrollY); invalidate(); } diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index 824f556f758a..962a8f16e552 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -1097,6 +1097,8 @@ public final class WebViewCore { static final int HEARTBEAT = 197; + static final int SCROLL_LAYER = 198; + // private message ids private static final int DESTROY = 200; @@ -1708,6 +1710,11 @@ public final class WebViewCore { mBrowserFrame.stringByEvaluatingJavaScriptFromString((String) msg.obj); } break; + case SCROLL_LAYER: + int nativeLayer = msg.arg1; + Rect rect = (Rect) msg.obj; + nativeScrollLayer(mNativeClass, nativeLayer, + rect); } } }; -- cgit v1.2.3-59-g8ed1b