Add EventForwarder for routing touch events

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.DragEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewStructure;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.widget.FrameLayout;
 
 import org.chromium.base.TraceEvent;
+import org.chromium.ui.base.EventForwarder;
 
 /**
  * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
  * exposes the various {@link View} functionality to it.
  */
 public class ContentView extends FrameLayout
         implements ContentViewCore.InternalAccessDelegate, SmartClipProvider {
 
     private static final String TAG = "cr.ContentView";
 
     // Default value to signal that the ContentView's size need not be overridden.
     public static final int DEFAULT_MEASURE_SPEC =
             MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
 
     protected final ContentViewCore mContentViewCore;
+    private EventForwarder mEventForwarder;
 
     /**
      * The desired size of this view in {@link MeasureSpec}. Set by the host
      * when it should be different from that of the parent.
      */
     private int mDesiredWidthMeasureSpec = DEFAULT_MEASURE_SPEC;
     private int mDesiredHeightMeasureSpec = DEFAULT_MEASURE_SPEC;
 
     /**
      * Constructs a new ContentView for the appropriate Android version.
@@ skipping 127 matching lines @@
         }
     }
 
     @Override
     public boolean onDragEvent(DragEvent event) {
         return mContentViewCore.onDragEvent(event);
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        return mContentViewCore.onTouchEvent(event);
+        return getEventForwarder().onTouchEvent(event);
     }
 
     /**
      * Mouse move events are sent on hover enter, hover move and hover exit.
      * They are sent on hover exit because sometimes it acts as both a hover
      * move and hover exit.
      */
     @Override
     public boolean onHoverEvent(MotionEvent event) {
         boolean consumed = mContentViewCore.onHoverEvent(event);
         if (!mContentViewCore.isTouchExplorationEnabled()) super.onHoverEvent(event);
         return consumed;
     }
 
     @Override
     public boolean onGenericMotionEvent(MotionEvent event) {
         return mContentViewCore.onGenericMotionEvent(event);
     }
 
+    private EventForwarder getEventForwarder() {
+        if (mEventForwarder == null) {
+            mEventForwarder = mContentViewCore.getWebContents().getEventForwarder();
+        }
+        return mEventForwarder;
+    }
+
     @Override
     public boolean performLongClick() {
         return false;
     }
 
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         mContentViewCore.onConfigurationChanged(newConfig);
     }
 
@@ skipping 121 matching lines @@
         public ContentViewApi23(Context context, ContentViewCore cvc) {
             super(context, cvc);
         }
 
         @Override
         public void onProvideVirtualStructure(final ViewStructure structure) {
             mContentViewCore.onProvideVirtualStructure(structure, false);
         }
     }
 }