[Android] Cache additional MotionEvent bits in MotionEventAndroid

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

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 4babcb907f11833081b671c9d05102421bc922a1..b021e57827b11b07e1f2d791018b184a16259292 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
@@ -1172,7 +1172,15 @@ public class ContentViewCore implements NavigationClient, AccessibilityStateChan
         }
 
         if (mNativeContentViewCore == 0) return false;
-        return nativeOnTouchEvent(mNativeContentViewCore, event);
+        final int pointerCount = event.getPointerCount();
+        return nativeOnTouchEvent(mNativeContentViewCore, event,
+                event.getEventTime(), eventAction,
+                pointerCount, event.getHistorySize(), event.getActionIndex(),
+                event.getX(), event.getY(),
+                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);
     }
 
     public void setIgnoreRemainingTouchEvents() {
@@ -3174,7 +3182,12 @@ public class ContentViewCore implements NavigationClient, AccessibilityStateChan
             long nativeContentViewCoreImpl, int orientation);
 
     // All touch events (including flings, scrolls etc) accept coordinates in physical pixels.
-    private native boolean nativeOnTouchEvent(long nativeContentViewCoreImpl, MotionEvent event);
+    private native boolean nativeOnTouchEvent(
+            long nativeContentViewCoreImpl, MotionEvent event,
+            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);
 
     private native int nativeSendMouseMoveEvent(
             long nativeContentViewCoreImpl, long timeMs, float x, float y);