Add AddChildFrameSink() and RemoveChildFrameSink() To WindowAndroidCompositor

ui/android/delegated_frame_host_android.cc

 // 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.
 
 #include "ui/android/delegated_frame_host_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 60 matching lines @@
       new cc::SurfaceFactory(frame_sink_id_, surface_manager_, this));
 
   background_layer_->SetBackgroundColor(background_color);
   view_->GetLayer()->AddChild(background_layer_);
   UpdateBackgroundLayer();
 }
 
 DelegatedFrameHostAndroid::~DelegatedFrameHostAndroid() {
   DestroyDelegatedContent();
   surface_factory_.reset();
-  UnregisterFrameSinkHierarchy();
+  DetachFromCompositor();
   surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
   background_layer_->RemoveFromParent();
 }
 
 DelegatedFrameHostAndroid::FrameData::FrameData() = default;
 
 DelegatedFrameHostAndroid::FrameData::~FrameData() = default;
 
 void DelegatedFrameHostAndroid::SubmitCompositorFrame(
     cc::CompositorFrame frame,
@@ skipping 104 matching lines @@
 void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
     const gfx::Size& size_in_dip) {
   container_size_in_dip_ = size_in_dip;
   float device_scale_factor = display::Screen::GetScreen()
       ->GetDisplayNearestWindow(view_).device_scale_factor();
   background_layer_->SetBounds(
       gfx::ConvertSizeToPixel(device_scale_factor, container_size_in_dip_));
   UpdateBackgroundLayer();
 }
 
-void DelegatedFrameHostAndroid::RegisterFrameSinkHierarchy(
-    const cc::FrameSinkId& parent_id) {
-  if (registered_parent_frame_sink_id_.is_valid())
-    UnregisterFrameSinkHierarchy();
-  registered_parent_frame_sink_id_ = parent_id;
+void DelegatedFrameHostAndroid::AttachToCompositor(
+    WindowAndroidCompositor* compositor) {
+  if (registered_parent_compositor_)
+    DetachFromCompositor();
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
-  surface_manager_->RegisterFrameSinkHierarchy(parent_id, frame_sink_id_);
+  compositor->AddChildFrameSink(frame_sink_id_);
+  registered_parent_compositor_ = compositor;
 }
 
-void DelegatedFrameHostAndroid::UnregisterFrameSinkHierarchy() {
-  if (!registered_parent_frame_sink_id_.is_valid())
+void DelegatedFrameHostAndroid::DetachFromCompositor() {
+  if (!registered_parent_compositor_)
     return;
   surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
-  surface_manager_->UnregisterFrameSinkHierarchy(
-      registered_parent_frame_sink_id_, frame_sink_id_);
-  registered_parent_frame_sink_id_ = cc::FrameSinkId();
+  registered_parent_compositor_->RemoveChildFrameSink(frame_sink_id_);
+  registered_parent_compositor_ = nullptr;
 }
 
 void DelegatedFrameHostAndroid::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   client_->ReturnResources(resources);
 }
 
 void DelegatedFrameHostAndroid::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   client_->SetBeginFrameSource(begin_frame_source);
@@ skipping 15 matching lines @@
         content_size_in_dip.width() < container_size_in_dip_.width() ||
         content_size_in_dip.height() < container_size_in_dip_.height();
   } else {
     background_is_drawable = true;
   }
 
   background_layer_->SetIsDrawable(background_is_drawable);
 }
 
 }  // namespace ui