DirectCompositorFrameSink Uses CompositorFrameSinkSupport

ui/android/delegated_frame_host_android.h

 // Copyright 2016 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 UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 #define UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "ui/android/ui_android_export.h"
 #include "ui/gfx/selection_bound.h"
 
 namespace cc {
 
 class CompositorFrame;
 class Layer;
 class SurfaceManager;
 class SurfaceLayer;
 class SurfaceIdAllocator;
 enum class SurfaceDrawStatus;
 
 }  // namespace cc
 
+namespace content {
+class CompositorImpl;
+}  // namespace content
+
 namespace ui {
 class ViewAndroid;
 class WindowAndroidCompositor;
 
 class UI_ANDROID_EXPORT DelegatedFrameHostAndroid
     : public cc::SurfaceFactoryClient {
  public:
   class Client {
    public:
     virtual void SetBeginFrameSource(
@@ skipping 24 matching lines @@
       cc::CopyOutputRequest::CopyOutputRequestCallback result_callback);
 
   void CompositorFrameSinkChanged();
 
   void UpdateBackgroundColor(SkColor color);
 
   void UpdateContainerSizeinDIP(const gfx::Size& size_in_dip);
 
   // Called when this DFH is attached/detached from a parent browser compositor
   // and needs to be attached to the surface hierarchy.
-  void RegisterFrameSinkHierarchy(const cc::FrameSinkId& parent_id);
-  void UnregisterFrameSinkHierarchy();
+  void AttachToCompositor(content::CompositorImpl* compositor);

[Fady Samuel, 2017/02/02 00:07:43]

This doesn't work. ui/android cannot depend on content. Maybe make thi
sui::WindowAndroidCompositor instead?

[Alex Z., 2017/02/02 00:17:32]

AttachToCompositor calls compositor->AddChildFrameSink(). boliu wasn't 
happy about adding AddChildFrameSink() to WindowAndroidCompositor. 
According to him, "this is an interface for WindowAndroid to call up to
the compositor. WindowAndroid isn't using this method". I'll ask him 
if there's any other way.

+  void DetachFromCompositor();
 
  private:
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   void UpdateBackgroundLayer();
 
   const cc::FrameSinkId frame_sink_id_;
 
   ViewAndroid* view_;
 
   cc::SurfaceManager* surface_manager_;
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
-  cc::FrameSinkId registered_parent_frame_sink_id_;
+  content::CompositorImpl* parent_compositor_impl_;
   Client* client_;
 
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
 
   struct FrameData {
     FrameData();
     ~FrameData();
 
     cc::LocalSurfaceId local_surface_id;
     gfx::Size surface_size;
@@ skipping 11 matching lines @@
   scoped_refptr<cc::Layer> background_layer_;
 
   gfx::Size container_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatedFrameHostAndroid);
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_DELEGATED_FRAME_HOST_ANDROID_H_