diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-01 17:12:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 17:12:06 -0800 |
| commit | 2b3fa9f062cc807eff2802da4d7eb075cc6023fc (patch) | |
| tree | adf5e3ef9e7b0eb1f5e2cd0d1ec2d6d8aa455437 /Source/WebKit/android/nav/WebView.cpp | |
| parent | 931e90d171935ef706b6906c5867a51fc491a83d (diff) | |
| parent | f286c7d338f3c0f398ee27abe1d37d670c51dbbb (diff) | |
| download | external_webkit-2b3fa9f062cc807eff2802da4d7eb075cc6023fc.zip external_webkit-2b3fa9f062cc807eff2802da4d7eb075cc6023fc.tar.gz external_webkit-2b3fa9f062cc807eff2802da4d7eb075cc6023fc.tar.bz2 | |
am f286c7d3: Merge "Scroll position now passed to all layers" into ics-mr1
* commit 'f286c7d338f3c0f398ee27abe1d37d670c51dbbb':
Scroll position now passed to all layers
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 0e4414e..5387406 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1090,6 +1090,12 @@ int scrollableLayer(int x, int y, SkIRect* layerRect, SkIRect* bounds) return 0; } +void scrollLayer(int layerId, int x, int y) +{ + if (m_glWebViewState) + m_glWebViewState->scrollLayer(layerId, x, y); +} + int getBlockLeftEdge(int x, int y, float scale) { CachedRoot* root = getFrameCache(AllowNewer); @@ -2658,6 +2664,9 @@ static bool nativeScrollLayer(JNIEnv* env, jobject obj, jint layerId, jint x, { #if ENABLE(ANDROID_OVERFLOW_SCROLL) WebView* view = GET_NATIVE_VIEW(env, obj); + view->scrollLayer(layerId, x, y); + + //TODO: the below only needed for the SW rendering path LayerAndroid* root = view->compositeRoot(); if (!root) return false; |