Add touch event methods to AwContents

They simply call out directly to ContentViewCore counterparts, except
onTouchEvent which also triggers hit test.

BUG=


Review URL: https://chromiumcodereview.appspot.com/11366208

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167348 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 15 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index c5e38c3..db92f07 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -398,20 +398,6 @@ public class AwContents {
     }
 
     /**
-     * This should be called from the onTouchEvent of the view.
-     */
-    public void considerMotionEventForHitTest(MotionEvent event) {
-        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
-          int actionIndex = event.getActionIndex();
-
-          // Note this will trigger IPC back to browser even if nothing is hit.
-          nativeRequestNewHitTestDataAt(mNativeAwContents,
-                                        Math.round(event.getX(actionIndex)),
-                                        Math.round(event.getY(actionIndex)));
-        }
-    }
-
-    /**
      * Method to return all hit test values relevant to public WebView API.
      * Note that this expose more data than needed for WebView.getHitTestResult.
      */
@@ -451,6 +437,38 @@ public class AwContents {
         msg.sendToTarget();
     }
 
+    /**
+     * @see android.webkit.WebView#onTouchEvent()
+     */
+    public boolean onTouchEvent(MotionEvent event) {
+        boolean rv = mContentViewCore.onTouchEvent(event);
+
+        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+          int actionIndex = event.getActionIndex();
+
+          // Note this will trigger IPC back to browser even if nothing is hit.
+          nativeRequestNewHitTestDataAt(mNativeAwContents,
+                                        Math.round(event.getX(actionIndex)),
+                                        Math.round(event.getY(actionIndex)));
+        }
+
+        return rv;
+    }
+
+    /**
+     * @see android.webkit.WebView#onHoverEvent()
+     */
+    public boolean onHoverEvent(MotionEvent event) {
+        return mContentViewCore.onHoverEvent(event);
+    }
+
+    /**
+     * @see android.webkit.WebView#onGenericMotionEvent()
+     */
+    public boolean onGenericMotionEvent(MotionEvent event) {
+        return mContentViewCore.onGenericMotionEvent(event);
+    }
+
     //--------------------------------------------------------------------------------------------
     //  Methods called from native via JNI
     //--------------------------------------------------------------------------------------------
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
index 1abf4f7..a71103a4 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebKitHitTestTest.java
@@ -74,7 +74,7 @@ public class WebKitHitTestTest extends AndroidWebViewTestBase {
             @Override
             public void run() {
                 long eventTime = SystemClock.uptimeMillis();
-                mAwContents.considerMotionEventForHitTest(MotionEvent.obtain(
+                mAwContents.onTouchEvent(MotionEvent.obtain(
                         eventTime, eventTime, MotionEvent.ACTION_DOWN,
                         (float)(mTestView.getRight() - mTestView.getLeft()) / 2,
                         (float)(mTestView.getBottom() - mTestView.getTop()) / 2,