DirectCompositorFrameSink Uses CompositorFrameSinkSupport

ui/android/delegated_frame_host_android.h

Index: ui/android/delegated_frame_host_android.h
diff --git a/ui/android/delegated_frame_host_android.h b/ui/android/delegated_frame_host_android.h
index 2e3ba78348fddd58e0501aa780385ff63a8f804a..2759352cc34b26bde34ff0124dc2ca1078674641 100644
--- a/ui/android/delegated_frame_host_android.h
+++ b/ui/android/delegated_frame_host_android.h
@@ -25,6 +25,10 @@ enum class SurfaceDrawStatus;
 
 }  // namespace cc
 
+namespace content {
+class CompositorImpl;
+}  // namespace content
+
 namespace ui {
 class ViewAndroid;
 class WindowAndroidCompositor;
@@ -69,8 +73,8 @@ class UI_ANDROID_EXPORT DelegatedFrameHostAndroid
 
   // 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.
@@ -85,7 +89,7 @@ class UI_ANDROID_EXPORT DelegatedFrameHostAndroid
 
   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_;