| 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 83ff58498eb4a533956229d7dbb147834e06006d..31a7b864631992fec6f918214e9fb465489c3d9c 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();
|
| @@ -125,8 +129,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.
|
| @@ -148,6 +152,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_;
|
|
|