From ecbfb2104f61f0a364a29b431abe6ec645ea6d51 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Wed, 3 Feb 2010 10:56:12 +0000
Subject: [PATCH] Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from
 Java to WebKit". The corresponding change to external/webkit creates a merge
 conflict in master.

Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.

This reverts commit 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing
changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3.

Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
---
 core/java/android/webkit/WebView.java     | 3 ---
 core/java/android/webkit/WebViewCore.java | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index ab43b30e35dd3..f2dab6e03b086 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4348,7 +4348,6 @@ public class WebView extends AbsoluteLayout
             ted.mAction = action;
             ted.mX = viewToContentX((int) x + mScrollX);
             ted.mY = viewToContentY((int) y + mScrollY);
-            ted.mEventTime = eventTime;
             mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
             mLastSentTouchTime = eventTime;
         }
@@ -4612,7 +4611,6 @@ public class WebView extends AbsoluteLayout
                             ted.mAction = WebViewCore.ACTION_DOUBLETAP;
                             ted.mX = viewToContentX((int) x + mScrollX);
                             ted.mY = viewToContentY((int) y + mScrollY);
-                            ted.mEventTime = eventTime;
                             mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
                         } else if (mFullScreenHolder == null) {
                             doDoubleTap();
@@ -5652,7 +5650,6 @@ public class WebView extends AbsoluteLayout
                         ted.mAction = WebViewCore.ACTION_LONGPRESS;
                         ted.mX = viewToContentX((int) mLastTouchX + mScrollX);
                         ted.mY = viewToContentY((int) mLastTouchY + mScrollY);
-                        ted.mEventTime = SystemClock.uptimeMillis();
                         mWebViewCore.sendMessage(EventHub.TOUCH_EVENT, ted);
                     } else if (mPreventDrag == PREVENT_DRAG_NO) {
                         mTouchMode = TOUCH_DONE_MODE;
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 6e45e39e96ff8..387942f757e37 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -512,7 +512,7 @@ final class WebViewCore {
     private native void nativeTouchUp(int touchGeneration,
             int framePtr, int nodePtr, int x, int y);
 
-    private native int nativeHandleTouchEvent(int action, int x, int y, long time);
+    private native int nativeHandleTouchEvent(int action, int x, int y);
 
     private native void nativeUpdateFrameCache();
 
@@ -731,7 +731,6 @@ final class WebViewCore {
         int mAction;
         int mX;
         int mY;
-        long mEventTime;
     }
 
     static class GeolocationPermissionsData {
@@ -1190,7 +1189,7 @@ final class WebViewCore {
                                     mWebView.mPrivateHandler,
                                     WebView.PREVENT_TOUCH_ID, ted.mAction,
                                     nativeHandleTouchEvent(ted.mAction, ted.mX,
-                                    ted.mY, ted.mEventTime)).sendToTarget();
+                                            ted.mY)).sendToTarget();
                             break;
                         }