Revert of chrome/android: Push EventFilters into the Layout implementations.

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java

 // Copyright 2015 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.chrome.browser.compositor.layouts;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.compositor.TitleCache;
 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
 import org.chromium.chrome.browser.compositor.layouts.components.VirtualView;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.BlackHoleEventFilter;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.EventFilter;
+import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureEventFilter;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection;
 import org.chromium.chrome.browser.compositor.layouts.phone.StackLayout;
 import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelperManager;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
@@ skipping 21 matching lines @@
 public class LayoutManagerChrome
         extends LayoutManagerDocument implements OverviewModeBehavior, CloseAllTabsDelegate {
     // Layouts
     /** An {@link Layout} that should be used as the accessibility tab switcher. */
     protected OverviewListLayout mOverviewListLayout;
     /** A {@link Layout} that should be used when the user is swiping sideways on the toolbar. */
     protected ToolbarSwipeLayout mToolbarSwipeLayout;
     /** A {@link Layout} that should be used when the user is in the tab switcher. */
     protected Layout mOverviewLayout;
 
+    // Event Filters
+    /** A {@link EventFilter} that consumes all touch events. */
+    protected EventFilter mBlackHoleEventFilter;
+    private final GestureEventFilter mGestureEventFilter;
+
     // Event Filter Handlers
     private final EdgeSwipeHandler mToolbarSwipeHandler;
 
     // Internal State
     /** A {@link TitleCache} instance that stores all title/favicon bitmaps as CC resources. */
     protected TitleCache mTitleCache;
 
     /** Whether or not animations are enabled.  This can disable certain layouts or effects. */
     private boolean mEnableAnimations = true;
     private boolean mCreatingNtp;
@@ skipping 83 matching lines @@
     public LayoutManagerChrome(LayoutManagerHost host, boolean createOverviewLayout) {
         super(host);
         Context context = host.getContext();
         LayoutRenderHost renderHost = host.getLayoutRenderHost();
 
         mOverviewModeObservers = new ObserverList<OverviewModeObserver>();
 
         // Build Event Filter Handlers
         mToolbarSwipeHandler = createToolbarSwipeHandler(this);
 
+        // Build Event Filters
+        mBlackHoleEventFilter = new BlackHoleEventFilter(context);
+        mGestureEventFilter = new GestureEventFilter(context, mGestureHandler);
+
         // Build Layouts
-        mOverviewListLayout = new OverviewListLayout(context, this, renderHost);
-        mToolbarSwipeLayout = new ToolbarSwipeLayout(context, this, renderHost);
+        mOverviewListLayout =
+                new OverviewListLayout(context, this, renderHost, mBlackHoleEventFilter);
+        mToolbarSwipeLayout =
+                new ToolbarSwipeLayout(context, this, renderHost, mBlackHoleEventFilter);
         if (createOverviewLayout) {
-            mOverviewLayout = new StackLayout(context, this, renderHost);
+            mOverviewLayout = new StackLayout(context, this, renderHost, mGestureEventFilter);
         }
     }
 
     /**
      * @return The {@link TabModelObserver} instance this class should be using.
      */
     protected LayoutManagerTabModelObserver createTabModelObserver() {
         return new LayoutManagerTabModelObserver();
     }
 
@@ skipping 119 matching lines @@
 
     /**
      * Simulates a click on the view at the specified pixel offset
      * from the top left of the view.
      * This is used by UI tests.
      * @param x Coordinate of the click in dp.
      * @param y Coordinate of the click in dp.
      */
     @VisibleForTesting
     public void simulateClick(float x, float y) {
-        if (getActiveLayout() instanceof StackLayout) {
-            ((StackLayout) getActiveLayout()).simulateClick(x, y);
-        }
+        if (getActiveLayout() != null) getActiveLayout().click(time(), x, y);
     }
 
     /**
      * Simulates a drag and issues Up-event to commit the drag.
      * @param x  Coordinate to start the Drag from in dp.
      * @param y  Coordinate to start the Drag from in dp.
      * @param dX Amount of drag in X direction in dp.
      * @param dY Amount of drag in Y direction in dp.
      */
     @VisibleForTesting
     public void simulateDrag(float x, float y, float dX, float dY) {
-        if (getActiveLayout() instanceof StackLayout) {
-            ((StackLayout) getActiveLayout()).simulateDrag(x, y, dX, dY);
+        if (getActiveLayout() != null) {
+            getActiveLayout().onDown(0, x, y);
+            getActiveLayout().drag(0, x, y, dX, dY);
+            getActiveLayout().onUpOrCancel(time());
         }
     }
 
     private boolean isOverviewLayout(Layout layout) {
         return layout != null && (layout == mOverviewLayout || layout == mOverviewListLayout);
     }
 
     @Override
     protected void startShowing(Layout layout, boolean animate) {
         mCreatingNtp = false;
@@ skipping 336 matching lines @@
 
     /**
      * @param id The id of the {@link Tab} to search for.
      * @return   A {@link Tab} instance or {@code null} if it could be found.
      */
     protected Tab getTabById(int id) {
         TabModelSelector selector = getTabModelSelector();
         return selector == null ? null : selector.getTabById(id);
     }
 }