Add EventForwarder for routing touch events

chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
index e4c3de2f19ed3e6e771db2b15dafb49048585158..079d8c39d61d261b6ca86fc05726b89842937a66 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -56,6 +56,7 @@ import org.chromium.chrome.browser.widget.ControlContainer;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.SPenSupport;
+import org.chromium.content_public.browser.EventForwarder;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.WindowAndroid;
@@ -395,17 +396,17 @@ public class CompositorViewHolder extends FrameLayout
 
     @Override
     public boolean dispatchDragEvent(DragEvent e) {
-        ContentViewCore contentViewCore = mTabVisible.getContentViewCore();
-        if (contentViewCore == null) return false;
+        EventForwarder eventForwarder = mTabVisible.getEventForwarder();
+        if (eventForwarder == null) return false;
 
         if (mLayoutManager != null) mLayoutManager.getViewportPixel(mCacheViewport);
-        contentViewCore.setCurrentTouchEventOffsets(-mCacheViewport.left, -mCacheViewport.top);
+        eventForwarder.setCurrentTouchEventOffsets(-mCacheViewport.left, -mCacheViewport.top);
         boolean ret = super.dispatchDragEvent(e);
 
         int action = e.getAction();
         if (action == DragEvent.ACTION_DRAG_EXITED || action == DragEvent.ACTION_DRAG_ENDED
                 || action == DragEvent.ACTION_DROP) {
-            contentViewCore.setCurrentTouchEventOffsets(0.f, 0.f);
+            eventForwarder.setCurrentTouchEventOffsets(0.f, 0.f);
         }
         return ret;
     }
@@ -494,8 +495,8 @@ public class CompositorViewHolder extends FrameLayout
         // TODO(dtrainor): Factor this out to LayoutDriver.
         if (e == null || mTabVisible == null) return;
 
-        ContentViewCore contentViewCore = mTabVisible.getContentViewCore();
-        if (contentViewCore == null) return;
+        EventForwarder eventForwarder = mTabVisible.getEventForwarder();
+        if (eventForwarder == null) return;
 
         int actionMasked = e.getActionMasked();
 
@@ -506,11 +507,11 @@ public class CompositorViewHolder extends FrameLayout
         if (actionMasked == MotionEvent.ACTION_DOWN
                 || actionMasked == MotionEvent.ACTION_HOVER_ENTER) {
             if (mLayoutManager != null) mLayoutManager.getViewportPixel(mCacheViewport);
-            contentViewCore.setCurrentTouchEventOffsets(-mCacheViewport.left, -mCacheViewport.top);
+            eventForwarder.setCurrentTouchEventOffsets(-mCacheViewport.left, -mCacheViewport.top);
         } else if (canClear && (actionMasked == MotionEvent.ACTION_UP
                                        || actionMasked == MotionEvent.ACTION_CANCEL
                                        || actionMasked == MotionEvent.ACTION_HOVER_EXIT)) {
-            contentViewCore.setCurrentTouchEventOffsets(0.f, 0.f);
+            eventForwarder.setCurrentTouchEventOffsets(0.f, 0.f);
         }
     }
 
@@ -899,7 +900,7 @@ public class CompositorViewHolder extends FrameLayout
      * @param contentViewCore The {@link ContentViewCore} to initialize.
      */
     private void initializeContentViewCore(ContentViewCore contentViewCore) {
-        contentViewCore.setCurrentTouchEventOffsets(0.f, 0.f);
+        contentViewCore.getWebContents().getEventForwarder().setCurrentTouchEventOffsets(0.f, 0.f);
         contentViewCore.setTopControlsHeight(getTopControlsHeightPixels(),
                 contentViewCore.doBrowserControlsShrinkBlinkSize());
         contentViewCore.setBottomControlsHeight(getBottomControlsHeightPixels());