diff options
| author | Chris Craik <ccraik@google.com> | 2011-12-01 17:08:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 17:08:14 -0800 |
| commit | f286c7d338f3c0f398ee27abe1d37d670c51dbbb (patch) | |
| tree | df5a050debc3187af0457cca543ba03111f6ca4b /Source/WebKit/android/nav/WebView.cpp | |
| parent | f1a221194f2b0d5fd82d2e98ced94f0553c45986 (diff) | |
| parent | 70adfd756fa5e71bd6913f3a1d8223ca26d8ec92 (diff) | |
| download | external_webkit-f286c7d338f3c0f398ee27abe1d37d670c51dbbb.zip external_webkit-f286c7d338f3c0f398ee27abe1d37d670c51dbbb.tar.gz external_webkit-f286c7d338f3c0f398ee27abe1d37d670c51dbbb.tar.bz2 | |
Merge "Scroll position now passed to all layers" into ics-mr1
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 fd05ecb..300b58e 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -1093,6 +1093,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); @@ -2668,6 +2674,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; |