DirectCompositorFrameSink Uses CompositorFrameSinkSupport

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 13bc544eda693a1f47ab1557080e0de1a72a0af4..90a5c5fcd5ee951143567394349b19925bb20261 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1410,12 +1410,10 @@ void RenderWidgetHostViewAndroid::StartObservingRootWindow() {
   if (!using_browser_compositor_)
     SetBeginFrameSource(view_.GetWindowAndroid()->GetBeginFrameSource());
 
-  ui::WindowAndroidCompositor* compositor =
-      view_.GetWindowAndroid()->GetCompositor();
-  if (compositor) {
-    delegated_frame_host_->RegisterFrameSinkHierarchy(
-        compositor->GetFrameSinkId());
-  }
+  CompositorImpl* compositor =
+      static_cast<CompositorImpl*>(view_.GetWindowAndroid()->GetCompositor());
+  if (compositor)
+    delegated_frame_host_->AttachToCompositor(compositor);
 }
 
 void RenderWidgetHostViewAndroid::StopObservingRootWindow() {
@@ -1439,7 +1437,7 @@ void RenderWidgetHostViewAndroid::StopObservingRootWindow() {
   // If the DFH has already been destroyed, it will have cleaned itself up.
   // This happens in some WebView cases.
   if (delegated_frame_host_)
-    delegated_frame_host_->UnregisterFrameSinkHierarchy();
+    delegated_frame_host_->DetachFromCompositor();
   DCHECK(!begin_frame_source_);
 }
 
@@ -1822,10 +1820,9 @@ void RenderWidgetHostViewAndroid::OnAttachCompositor() {
   DCHECK(content_view_core_);
   CreateOverscrollControllerIfPossible();
   if (observing_root_window_) {
-    ui::WindowAndroidCompositor* compositor =
-        view_.GetWindowAndroid()->GetCompositor();
-    delegated_frame_host_->RegisterFrameSinkHierarchy(
-        compositor->GetFrameSinkId());
+    CompositorImpl* compositor =
+        static_cast<CompositorImpl*>(view_.GetWindowAndroid()->GetCompositor());
+    delegated_frame_host_->AttachToCompositor(compositor);
   }
 }
 
@@ -1834,7 +1831,7 @@ void RenderWidgetHostViewAndroid::OnDetachCompositor() {
   DCHECK(using_browser_compositor_);
   RunAckCallbacks();
   overscroll_controller_.reset();
-  delegated_frame_host_->UnregisterFrameSinkHierarchy();
+  delegated_frame_host_->DetachFromCompositor();
 }
 
 void RenderWidgetHostViewAndroid::OnBeginFrame(const cc::BeginFrameArgs& args) {