Move the event offsetting logic from ContentView to CVC

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

Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index db99fe8441ccfacec2f01b372cd68c076fdbed3c..a347c0373cbe402b113b2412f0190c77612ee60c 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -33,8 +33,6 @@ public class ContentView extends FrameLayout
 
     private final ContentViewCore mContentViewCore;
 
-    private float mCurrentTouchOffsetX;
-    private float mCurrentTouchOffsetY;
     private final int[] mLocationInWindow = new int[2];
 
     /**
@@ -170,10 +168,7 @@ public class ContentView extends FrameLayout
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        MotionEvent offset = createOffsetMotionEvent(event);
-        boolean consumed = mContentViewCore.onTouchEvent(offset);
-        offset.recycle();
-        return consumed;
+        return mContentViewCore.onTouchEvent(event);
     }
 
     /**
@@ -183,9 +178,7 @@ public class ContentView extends FrameLayout
      */
     @Override
     public boolean onHoverEvent(MotionEvent event) {
-        MotionEvent offset = createOffsetMotionEvent(event);
-        boolean consumed = mContentViewCore.onHoverEvent(offset);
-        offset.recycle();
+        boolean consumed = mContentViewCore.onHoverEvent(event);
         if (!mContentViewCore.isTouchExplorationEnabled()) super.onHoverEvent(event);
         return consumed;
     }
@@ -200,23 +193,6 @@ public class ContentView extends FrameLayout
         return false;
     }
 
-    /**
-     * Sets the current amount to offset incoming touch events by.  This is used to handle content
-     * moving and not lining up properly with the android input system.
-     * @param dx The X offset in pixels to shift touch events.
-     * @param dy The Y offset in pixels to shift touch events.
-     */
-    public void setCurrentMotionEventOffsets(float dx, float dy) {
-        mCurrentTouchOffsetX = dx;
-        mCurrentTouchOffsetY = dy;
-    }
-
-    private MotionEvent createOffsetMotionEvent(MotionEvent src) {
-        MotionEvent dst = MotionEvent.obtain(src);
-        dst.offsetLocation(mCurrentTouchOffsetX, mCurrentTouchOffsetY);
-        return dst;
-    }
-
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         mContentViewCore.onConfigurationChanged(newConfig);