Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1775)

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

Issue 1988023010: Toolbar is a root layer for the UI compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comments Created 4 years, 7 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
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java
index 72d3c3f2df0a107029c15f2d71cf6ce69837ab48..f10e88f85414572ee9caeadaf3a9617ffc333856 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerDocument.java
@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandl
import org.chromium.chrome.browser.compositor.layouts.eventfilter.EmptyEdgeSwipeHandler;
import org.chromium.chrome.browser.compositor.layouts.eventfilter.GestureHandler;
import org.chromium.chrome.browser.compositor.overlays.SceneOverlay;
+import org.chromium.chrome.browser.compositor.scene_layer.ToolbarSceneLayer;
import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;
import org.chromium.chrome.browser.device.DeviceClassManager;
import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;
@@ -68,6 +69,7 @@ public class LayoutManagerDocument extends LayoutManager
private final ContextualSearchPanel mContextualSearchPanel;
private final ReaderModePanel mReaderModePanel;
private final OverlayPanelManager mOverlayPanelManager;
+ private final ToolbarSceneLayer mToolbarOverlay;
/** A delegate for interacting with the Contextual Search manager. */
protected ContextualSearchManagementDelegate mContextualSearchDelegate;
@@ -84,6 +86,8 @@ public class LayoutManagerDocument extends LayoutManager
mContext = host.getContext();
LayoutRenderHost renderHost = host.getLayoutRenderHost();
+ mToolbarOverlay = new ToolbarSceneLayer(mContext, this, renderHost);
+
// Build Event Filter Handlers
mGestureHandler = new GestureHandlerLayoutDelegate(this);
mToolbarSwipeHandler = new ToolbarSwipeHandler(this);
@@ -219,8 +223,12 @@ public class LayoutManagerDocument extends LayoutManager
/**
* Add any {@link SceneOverlay}s to the layout. This can be used to add the overlays in a
* particular order.
+ * Classes that override this method should be careful about the order that
+ * overlays are added and when super is called (i.e. cases where one overlay needs to be
+ * on top of another positioned.
*/
protected void addAllSceneOverlays() {
+ addGlobalSceneOverlay(mToolbarOverlay);
mStaticLayout.addSceneOverlay(mContextualSearchPanel);
mStaticLayout.addSceneOverlay(mReaderModePanel);
}

Powered by Google App Engine
This is Rietveld 408576698