Index: android_webview/java/src/org/chromium/android_webview/AwContents.java |
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 fc456df4a0d89ff83c3ce0ec1e57b8d2fa341ba2..ffee78ed8fdbb009e3bd5d57b78983c008f5bc85 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java |
@@ -2287,12 +2287,15 @@ public class AwContents { |
if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { |
int actionIndex = event.getActionIndex(); |
+ final int pointerCount = event.getPointerCount(); |
// Note this will trigger IPC back to browser even if nothing is |
// hit. |
nativeRequestNewHitTestDataAt(mNativeAwContents, |
(int) Math.round(event.getX(actionIndex) / mDIPScale), |
hush (inactive)
2014/08/14 17:25:21
Bo, I think this "actionIndex" is wrong here. Shou
hush (inactive)
2014/08/14 17:34:32
Sorry... this is correct. Nevermind
On 2014/08/14
|
- (int) Math.round(event.getY(actionIndex) / mDIPScale)); |
+ (int) Math.round(event.getY(actionIndex) / mDIPScale), |
+ event.getToolMajor(0) / (float) mDIPScale, |
jdduke (slow)
2014/08/14 17:28:40
Just talked offline with Bo, didn't realize this w
|
+ (pointerCount > 1 ? event.getToolMajor(1) : 0f) / (float) mDIPScale); |
boliu
2014/08/14 16:36:53
Shouldn't this be getToolMinor rather than getting
hush (inactive)
2014/08/14 17:25:21
I think I should just remove this parameter and ju
|
} |
if (mOverScrollGlow != null) { |
@@ -2450,7 +2453,8 @@ public class AwContents { |
private native byte[] nativeGetCertificate(long nativeAwContents); |
// Coordinates in desity independent pixels. |
- private native void nativeRequestNewHitTestDataAt(long nativeAwContents, int x, int y); |
+ private native void nativeRequestNewHitTestDataAt(long nativeAwContents, int x, int y, |
+ float touchMajor0, float touchMajor1); |
private native void nativeUpdateLastHitTestData(long nativeAwContents); |
private native void nativeOnSizeChanged(long nativeAwContents, int w, int h, int ow, int oh); |