| 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 72404b226867dbda138c7a7d8f458963054c4e0a..c740b82c86954df066df10d73f979908824e8f02 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
|
| @@ -1353,8 +1353,7 @@ public class ContentViewCore implements MotionEventDelegate {
|
| // Returns true if the native side crashed so that java side can draw a sad tab.
|
| private native boolean nativeCrashed(int nativeContentViewCoreImpl);
|
|
|
| - private native boolean nativeTouchEvent(int nativeContentViewCoreImpl,
|
| - long timeMs, int action,
|
| + private native boolean nativeTouchEvent(int nativeContentViewCoreImpl, long timeMs, int action,
|
| TouchPoint[] pts);
|
|
|
| private native void nativeScrollBegin(int nativeContentViewCoreImpl, long timeMs, int x, int y);
|
| @@ -1388,7 +1387,7 @@ public class ContentViewCore implements MotionEventDelegate {
|
| int anchorX, int anchorY, float deltaScale);
|
|
|
| private native void nativeSelectBetweenCoordinates(
|
| - int nativeContentViewCore, int x1, int y1, int x2, int y2);
|
| + int nativeContentViewCoreImpl, int x1, int y1, int x2, int y2);
|
|
|
| private native boolean nativeCanGoBack(int nativeContentViewCoreImpl);
|
|
|
| @@ -1416,7 +1415,7 @@ public class ContentViewCore implements MotionEventDelegate {
|
|
|
| private native int nativeEvaluateJavaScript(String script);
|
|
|
| - private native int nativeGetNativeImeAdapter(int nativeContentViewCore);
|
| + private native int nativeGetNativeImeAdapter(int nativeContentViewCoreImpl);
|
|
|
| private native void nativeAddJavascriptInterface(int nativeContentViewCoreImpl, Object object,
|
| String name, boolean requireAnnotation);
|
|
|