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

am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit

Browse Source 
Merge commit '3db1ebaf1cc2a097845f217626e31d69e156b73d'

* commit '3db1ebaf1cc2a097845f217626e31d69e156b73d':
  Pass touch event time from Java to WebKit
This commit is contained in:
Grace Kloba
2010-02-02 23:23:40 -08:00
committed by Android Git Automerger
parent 019fe73ddb 3db1ebaf1c
commit 9ecd9437ed
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4348,6 +4348,7 @@ 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;
}
@@ -4611,6 +4612,7 @@ 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();
@@ -5650,6 +5652,7 @@ 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);
private native int nativeHandleTouchEvent(int action, int x, int y, long time);
private native void nativeUpdateFrameCache();
@@ -731,6 +731,7 @@ final class WebViewCore {
int mAction;
int mX;
int mY;
long mEventTime;
}
static class GeolocationPermissionsData {
@@ -1189,7 +1190,7 @@ final class WebViewCore {
mWebView.mPrivateHandler,
WebView.PREVENT_TOUCH_ID, ted.mAction,
nativeHandleTouchEvent(ted.mAction, ted.mX,
ted.mY)).sendToTarget();
ted.mY, ted.mEventTime)).sendToTarget();
break;
}