Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev

2012-08-20 17:33:19 -07:00
parent a5d5d608cc f2e6115404
commit c2cb8d2263
1 changed files with 7 additions and 3 deletions
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -6448,9 +6448,13 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
                                mWebViewPrivate.getVerticalScrollFactor());
                        final int hdelta = (int) (hscroll *
                                mWebViewPrivate.getHorizontalScrollFactor());
-                        if (pinScrollBy(hdelta, vdelta, false, 0)) {
-                            return true;
-                        }
+
+                        abortAnimation();
+                        int oldTouchMode = mTouchMode;
+                        startScrollingLayer(event.getX(), event.getY());
+                        doDrag(hdelta, vdelta);
+                        mTouchMode = oldTouchMode;
+                        return true;
                    }
                }
            }