| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java
|
| index 514721a1644758ab04d7d08ede3f64b5264e51c6..4d19153015843b4517bdb345deff02118c0fd098 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/SimpleAnimationLayout.java
|
| @@ -15,6 +15,7 @@ import org.chromium.chrome.browser.compositor.layouts.LayoutRenderHost;
|
| import org.chromium.chrome.browser.compositor.layouts.LayoutUpdateHost;
|
| import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
|
| 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.EventFilter;
|
| import org.chromium.chrome.browser.compositor.layouts.phone.stack.Stack;
|
| import org.chromium.chrome.browser.compositor.layouts.phone.stack.StackAnimation;
|
| @@ -66,6 +67,7 @@ public class SimpleAnimationLayout
|
|
|
| private LayoutTab mAnimatedTab;
|
| private final TabListSceneLayer mSceneLayer;
|
| + private final BlackHoleEventFilter mBlackHoleEventFilter;
|
|
|
| /**
|
| * Creates an instance of the {@link SimpleAnimationLayout}.
|
| @@ -74,9 +76,10 @@ public class SimpleAnimationLayout
|
| * @param renderHost The {@link LayoutRenderHost} view for this layout.
|
| * @param eventFilter The {@link EventFilter} that is needed for this view.
|
| */
|
| - public SimpleAnimationLayout(Context context, LayoutUpdateHost updateHost,
|
| - LayoutRenderHost renderHost, EventFilter eventFilter) {
|
| - super(context, updateHost, renderHost, eventFilter);
|
| + public SimpleAnimationLayout(
|
| + Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost) {
|
| + super(context, updateHost, renderHost);
|
| + mBlackHoleEventFilter = new BlackHoleEventFilter(context);
|
| mSceneLayer = new TabListSceneLayer();
|
| }
|
|
|
| @@ -407,6 +410,11 @@ public class SimpleAnimationLayout
|
| public void onPropertyAnimationFinished(Property prop) {}
|
|
|
| @Override
|
| + protected EventFilter getEventFilter() {
|
| + return mBlackHoleEventFilter;
|
| + }
|
| +
|
| + @Override
|
| protected SceneLayer getSceneLayer() {
|
| return mSceneLayer;
|
| }
|
|
|