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..96ccbf545ce6d55f126e01d53263245817f7ccf2 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"
@@ -103,6 +104,8 @@ class CONTENT_EXPORT CompositorImpl
       std::unique_ptr<cc::CopyOutputRequest> request) override;
   void SetNeedsAnimate() override;
   cc::FrameSinkId GetFrameSinkId() override;
+  void AddChildFrameSink(const cc::FrameSinkId& frame_sink_id);

[Fady Samuel, 2017/02/02 16:40:26]

Add override; to the end.

[Alex Z., 2017/02/02 17:01:56]

Done.

+  void RemoveChildFrameSink(const cc::FrameSinkId& frame_sink_id);

[Fady Samuel, 2017/02/02 16:40:26]

Add override; to the end.

[Alex Z., 2017/02/02 17:01:56]

Done.

 
   void SetVisible(bool visible);
   void CreateLayerTreeHost();
@@ -165,6 +168,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);