| 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 64b1d582eca608e3d74a9dcea2fbc615e6fcaa91..ecc8981309663b54a2c26d0628a12096ddeedc80 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
|
| @@ -1108,7 +1108,8 @@ public class ContentViewCore
|
| pointerCount > 1 ? event.getX(1) : 0,
|
| pointerCount > 1 ? event.getY(1) : 0,
|
| event.getPointerId(0), pointerCount > 1 ? event.getPointerId(1) : -1,
|
| - event.getTouchMajor(), pointerCount > 1 ? event.getTouchMajor(1) : 0);
|
| + event.getTouchMajor(), pointerCount > 1 ? event.getTouchMajor(1) : 0,
|
| + event.getToolType(0));
|
|
|
| if (offset != null) offset.recycle();
|
| return consumed;
|
| @@ -3126,7 +3127,8 @@ public class ContentViewCore
|
| long timeMs, int action, int pointerCount, int historySize, int actionIndex,
|
| float x0, float y0, float x1, float y1,
|
| int pointerId0, int pointerId1,
|
| - float touchMajor0, float touchMajor1);
|
| + float touchMajor0, float touchMajor1,
|
| + int toolType);
|
|
|
| private native int nativeSendMouseMoveEvent(
|
| long nativeContentViewCoreImpl, long timeMs, float x, float y);
|
|
|