| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index 5973aefea5120b20a6900cf2b995937f6f4653d0..29083049788a685053c4059f4a26919577e56c8a 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -1101,6 +1101,8 @@ public class ContentViewCore
|
| }
|
|
|
| final int pointerCount = event.getPointerCount();
|
| + final int toolType = pointerCount > 0 ?
|
| + event.getToolType(0) : MotionEvent.TOOL_TYPE_UNKNOWN;
|
| final boolean consumed = nativeOnTouchEvent(mNativeContentViewCore, event,
|
| event.getEventTime(), eventAction,
|
| pointerCount, event.getHistorySize(), event.getActionIndex(),
|
| @@ -1109,7 +1111,8 @@ public class ContentViewCore
|
| pointerCount > 1 ? event.getY(1) : 0,
|
| event.getPointerId(0), pointerCount > 1 ? event.getPointerId(1) : -1,
|
| event.getTouchMajor(), pointerCount > 1 ? event.getTouchMajor(1) : 0,
|
| - event.getRawX(), event.getRawY());
|
| + event.getRawX(), event.getRawY(),
|
| + toolType, event.getButtonState());
|
|
|
| if (offset != null) offset.recycle();
|
| return consumed;
|
| @@ -3142,7 +3145,8 @@ public class ContentViewCore
|
| float x0, float y0, float x1, float y1,
|
| int pointerId0, int pointerId1,
|
| float touchMajor0, float touchMajor1,
|
| - float rawX, float rawY);
|
| + float rawX, float rawY,
|
| + int androidToolType, int androidButtonState);
|
|
|
| private native int nativeSendMouseMoveEvent(
|
| long nativeContentViewCoreImpl, long timeMs, float x, float y);
|
|
|