DirectCompositorFrameSink Uses CompositorFrameSinkSupport

content/browser/renderer_host/compositor_impl_android.h

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..c6cdf4b050be0bfb29e15b55a9fff40125aa37e1 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -8,6 +8,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <unordered_set>
 
 #include "base/cancelable_callback.h"
 #include "base/compiler_specific.h"
@@ -57,6 +58,7 @@ class CONTENT_EXPORT CompositorImpl
   ~CompositorImpl() override;
 
   static bool IsInitialized();
+  void AddChildFrameSink(cc::FrameSinkId frame_sink_id);

[Fady Samuel, 2017/01/29 15:43:02]

const cc::FrameSinkId&

[Alex Z., 2017/01/30 20:37:49]

Done.

 
   // ui::ResourceProvider implementation.
   cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) override;
@@ -165,6 +167,10 @@ class CONTENT_EXPORT CompositorImpl
   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);