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

Unified Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 2688113002: Make ViewRoot the top of the ViewAndroid tree (Closed)
Patch Set: comments Created 3 years, 10 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: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 6d49a396a9d8be47d62bc53da8db711ab1200ab8..8c8bc716f1f1946bc2cb5ba2e9437a05b9c14c53 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -40,6 +40,10 @@ class OutputSurface;
class VulkanContextProvider;
}
+namespace ui {
+class ViewRoot;
+}
+
namespace content {
class CompositorClient;
@@ -53,7 +57,7 @@ class CONTENT_EXPORT CompositorImpl
public ui::UIResourceProvider,
public ui::WindowAndroidCompositor {
public:
- CompositorImpl(CompositorClient* client, gfx::NativeWindow root_window);
+ CompositorImpl(CompositorClient* client, ui::ViewRoot* view_root);
~CompositorImpl() override;
static bool IsInitialized();
@@ -127,8 +131,8 @@ class CONTENT_EXPORT CompositorImpl
cc::FrameSinkId frame_sink_id_;
- // root_layer_ is the persistent internal root layer, while subroot_layer_
- // is the one attached by the compositor client.
+ // Layer in |view_root_| is the persistent internal root layer,
+ // while subroot_layer_ is the one attached by the compositor client.
scoped_refptr<cc::Layer> subroot_layer_;
// Subtree for hidden layers with CopyOutputRequests on them.
@@ -150,6 +154,7 @@ class CONTENT_EXPORT CompositorImpl
CompositorClient* client_;
gfx::NativeWindow root_window_;
+ ui::ViewRoot* view_root_;
// Whether we need to update animations on the next composite.
bool needs_animate_;

Powered by Google App Engine
This is Rietveld 408576698