Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
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 9ecd9437ed, reversing
changes made to 019fe73ddb.

Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
This commit is contained in:
Ben Murdoch
2010-02-03 10:56:12 +00:00
parent 9ecd9437ed
commit ecbfb2104f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebView.java
View File

@@ -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;

5
core/java/android/webkit/WebViewCore.java
View File

@@ -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;
}