Fix OOPIFs on Android

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 "cc/layers/solid_color_layer.h"
 #include "cc/layers/surface_layer.h"
@@ skipping 75 matching lines @@
   surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_id());
 
   background_layer_->SetBackgroundColor(background_color);
   view_->GetLayer()->AddChild(background_layer_);
   UpdateBackgroundLayer();
 }
 
 DelegatedFrameHostAndroid::~DelegatedFrameHostAndroid() {
   DestroyDelegatedContent();
   surface_factory_.reset();
+  UnregisterSurfaceNamespaceHierarchy();
   surface_manager_->InvalidateSurfaceClientId(
       surface_id_allocator_->client_id());
   background_layer_->RemoveFromParent();
 }
 
 DelegatedFrameHostAndroid::FrameData::FrameData() = default;
 
 DelegatedFrameHostAndroid::FrameData::~FrameData() = default;
 
 void DelegatedFrameHostAndroid::SubmitCompositorFrame(
@@ skipping 108 matching lines @@
 }
 
 void DelegatedFrameHostAndroid::UpdateContainerSizeinDIP(
     const gfx::Size& size_in_dip) {
   container_size_in_dip_ = size_in_dip;
   background_layer_->SetBounds(gfx::ConvertSizeToPixel(
       gfx::DeviceDisplayInfo().GetDIPScale(), container_size_in_dip_));
   UpdateBackgroundLayer();
 }
 
+void DelegatedFrameHostAndroid::RegisterSurfaceNamespaceHierarchy(
+    uint32_t parent_id) {
+  if (registered_parent_client_id_ != 0u)
+    UnregisterSurfaceNamespaceHierarchy();
+  registered_parent_client_id_ = parent_id;
+  surface_manager_->RegisterSurfaceFactoryClient(
+      surface_id_allocator_->client_id(), this);
+  surface_manager_->RegisterSurfaceNamespaceHierarchy(
+      parent_id, surface_id_allocator_->client_id());
+}
+
+void DelegatedFrameHostAndroid::UnregisterSurfaceNamespaceHierarchy() {
+  if (registered_parent_client_id_ == 0u)
+    return;
+  surface_manager_->UnregisterSurfaceFactoryClient(
+      surface_id_allocator_->client_id());
+  surface_manager_->UnregisterSurfaceNamespaceHierarchy(
+      registered_parent_client_id_, surface_id_allocator_->client_id());
+  registered_parent_client_id_ = 0u;
+}
+
 void DelegatedFrameHostAndroid::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   return_resources_callback_.Run(resources);
 }
 
 void DelegatedFrameHostAndroid::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
-  // TODO(tansell): Hook this up.
+  // TODO(enne): hook this up instead of making RWHVAndroid a
+  // WindowAndroidObserver.
 }
 
 void DelegatedFrameHostAndroid::UpdateBackgroundLayer() {
   // The background layer draws in 2 cases:
   // 1) When we don't have any content from the renderer.
   // 2) When the bounds of the content received from the renderer does not match
   // the desired content bounds.
   bool background_is_drawable = false;
 
   if (current_frame_) {
     float device_scale_factor = gfx::DeviceDisplayInfo().GetDIPScale();
     gfx::Size content_size_in_dip = gfx::ConvertSizeToDIP(
         device_scale_factor, current_frame_->surface_size);
     background_is_drawable =
         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