Make ViewRoot the top of the ViewAndroid tree

content/browser/renderer_host/compositor_impl_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 22 matching lines @@
 
 namespace cc {
 class AnimationHost;
 class Display;
 class Layer;
 class LayerTreeHost;
 class OutputSurface;
 class VulkanContextProvider;
 }
 
+namespace ui {
+class ViewRoot;
+}
+
 namespace content {
 class CompositorClient;
 
 // -----------------------------------------------------------------------------
 // Browser-side compositor that manages a tree of content and UI layers.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT CompositorImpl
     : public Compositor,
       public cc::LayerTreeHostClient,
       public cc::LayerTreeHostSingleThreadClient,
       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();
 
   // ui::ResourceProvider implementation.
   cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
   void DeleteUIResource(cc::UIResourceId resource_id) override;
   bool SupportsETC1NonPowerOfTwo() const override;
 
  private:
@@ skipping 53 matching lines @@
   void InitializeDisplay(
       std::unique_ptr<cc::OutputSurface> display_output_surface,
       scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
       scoped_refptr<cc::ContextProvider> context_provider);
 
   bool HavePendingReadbacks();
   void SetBackgroundColor(int color);
 
   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.
   scoped_refptr<cc::Layer> readback_layer_tree_;
 
   // Destruction order matters here:
   std::unique_ptr<cc::AnimationHost> animation_host_;
   std::unique_ptr<cc::LayerTreeHost> host_;
   ui::ResourceManagerImpl resource_manager_;
 
   std::unique_ptr<cc::Display> display_;
 
   gfx::Size size_;
   bool has_transparent_background_;
 
   ANativeWindow* window_;
   gpu::SurfaceHandle surface_handle_;
 
   CompositorClient* client_;
 
   gfx::NativeWindow root_window_;
+  ui::ViewRoot* view_root_;
 
   // Whether we need to update animations on the next composite.
   bool needs_animate_;
 
   // The number of SwapBuffer calls that have not returned and ACK'd from
   // the GPU thread.
   unsigned int pending_swapbuffers_;
 
   size_t num_successive_context_creation_failures_;
 
   // Whether there is an CompositorFrameSink request pending from the current
   // |host_|. Becomes |true| if RequestNewCompositorFrameSink is called, and
   // |false| if |host_| is deleted or we succeed in creating *and* initializing
   // a CompositorFrameSink (which is essentially the contract with cc).
   bool compositor_frame_sink_request_pending_;
 
   gpu::Capabilities gpu_capabilities_;
   bool has_compositor_frame_sink_ = false;
   std::unordered_set<cc::FrameSinkId, cc::FrameSinkIdHash>
       pending_child_frame_sink_ids_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_