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

Author: jreck

core/java/android/webkit/WebViewClassic.java

@@ -6448,9 +6448,13 @@ public boolean onGenericMotionEvent(MotionEvent event) {
                                 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;
                     }
                 }
             }