chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java - Issue 1716653002: Implement OverlayPanels as SceneOverlays

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

Issue 1716653002: Implement OverlayPanels as SceneOverlays (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix tests Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/ContextualSearchEventFilter.java » ('j') | chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

index 4375a0c36fe689c41c618b2c6c14fff902cc46a6..d2bb422689dfd8285b3f59c2dd6b1dad80231087 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/StaticLayout.java

@@ -10,7 +10,6 @@ import android.os.Handler;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.compositor.LayerTitleCache;

-import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;

import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;

import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;

import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;

@@ -31,7 +30,7 @@ import java.util.LinkedList;

* {@link #tabSelecting(long, int)} call, and is used to show a thumbnail of a {@link Tab}

* until that {@link Tab} is ready to be shown.

-public class StaticLayout extends ContextualSearchSupportedLayout {

Theresa 2016/04/21 21:22:39 Yes!!

mdjones 2016/04/22 17:03:42 This was honestly the most satisfying line of this

+public class StaticLayout extends Layout {

public static final String TAG = "StaticLayout";

private static final int HIDE_TIMEOUT_MS = 2000;

@@ -67,7 +66,7 @@ public class StaticLayout extends ContextualSearchSupportedLayout {

public StaticLayout(Context context, LayoutUpdateHost updateHost, LayoutRenderHost renderHost,

EventFilter eventFilter, OverlayPanelManager panelManager) {

- super(context, updateHost, renderHost, eventFilter, panelManager);

+ super(context, updateHost, renderHost, eventFilter);

mHandler = new Handler();

mUnstallRunnable = new UnstallRunnable();

@@ -240,13 +239,6 @@ public class StaticLayout extends ContextualSearchSupportedLayout {

mRenderHost.getTopControlsUrlBarAlpha(), fullscreenManager, resourceManager,

forceHideTopControlsAndroidView(), getSizingFlags());

- // TODO(pedrosimonetti): Coordinate w/ dtrainor@ to improve integration with TreeProvider.

pedro (no code reviews) 2016/04/22 02:11:05 :)

mdjones 2016/04/22 17:03:42 :D

- SceneLayer overlayLayer = null;

- OverlayPanel panel = mPanelManager.getActivePanel();

- if (panel != null && panel.isShowing()) {

- overlayLayer = super.getSceneLayer();

- }

// TODO(dtrainor): Find the best way to properly track this metric for cold starts.

// We should probably erase the thumbnail when we select a tab that we need to restore.

if (tabContentManager != null