cc: Get rid of LayerTreeHost::output_surface_lost_ state.

ui/compositor/compositor.cc

 // Copyright (c) 2012 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/compositor/compositor.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <deque>
@@ skipping 71 matching lines @@
       output_surface_requested_(false),
       surface_id_allocator_(new cc::SurfaceIdAllocator(
           context_factory->AllocateSurfaceClientId())),
       task_runner_(task_runner),
       vsync_manager_(new CompositorVSyncManager()),
       device_scale_factor_(0.0f),
       locks_will_time_out_(true),
       compositor_lock_(NULL),
       layer_animator_collection_(this),
       weak_ptr_factory_(this) {
-  if (context_factory->GetSurfaceManager()) {
-    context_factory->GetSurfaceManager()->RegisterSurfaceClientId(
-        surface_id_allocator_->client_id());
-  }
+  context_factory->GetSurfaceManager()->RegisterSurfaceClientId(
+      surface_id_allocator_->client_id());
   root_web_layer_ = cc::Layer::Create();
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   cc::LayerTreeSettings settings;
 
   // This will ensure PictureLayers always can have LCD text, to match the
   // previous behaviour with ContentLayers, where LCD-not-allowed notifications
   // were ignored.
   settings.layers_always_allowed_lcd_text = true;
@@ skipping 129 matching lines @@
 
   if (animation_timeline_)
     host_->GetLayerTree()->animation_host()->RemoveAnimationTimeline(
         animation_timeline_.get());
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   context_factory_->RemoveCompositor(this);
-  if (context_factory_->GetSurfaceManager()) {
-    for (auto& client : surface_clients_) {
-      if (client.second) {
-        context_factory_->GetSurfaceManager()
-            ->UnregisterSurfaceNamespaceHierarchy(client.second, client.first);
-      }
-    }
-    context_factory_->GetSurfaceManager()->InvalidateSurfaceClientId(
-        surface_id_allocator_->client_id());
+  auto* manager = context_factory_->GetSurfaceManager();
+  for (auto& client : surface_clients_) {
+    DCHECK(client.second);
+    manager->UnregisterSurfaceNamespaceHierarchy(client.second, client.first);
   }
+  manager->InvalidateSurfaceClientId(surface_id_allocator_->client_id());
 }
 
 void Compositor::AddSurfaceClient(uint32_t client_id) {
-  // We don't give the client a parent until the ui::Compositor has an
-  // OutputSurface.
-  uint32_t parent_client_id = 0;
-  if (host_->has_output_surface()) {
-    parent_client_id = surface_id_allocator_->client_id();
-    context_factory_->GetSurfaceManager()->RegisterSurfaceNamespaceHierarchy(
-        parent_client_id, client_id);
-  }
+  uint32_t parent_client_id = surface_id_allocator_->client_id();
+  context_factory_->GetSurfaceManager()->RegisterSurfaceNamespaceHierarchy(

[Fady Samuel, 2016/08/25 02:43:06]

This all kind of goes in the opposite direction of where I was hoping to go.

I wanted to tie SurfaceFactory to a particular client and tie all this
registration stuff to SurfaceFactory lifetime (creation and destruction).

Thus you can't register hierarchies until you have a SurfaceFactory.

We hope to pull SurfaceManager and SurfaceFactory (all display compositor
things) into the gpu process for both tadpole and salamander and so I was hoping
to make this code more async friendly.

I've been prototyping this in jellyfish to convince myself it'll work and I'm
pretty close to being convinced :-)

This is change in ui::Compositor blocking your CL?

[piman, 2016/08/25 03:33:45]

Does the SurfaceFactory have to be tied to the OutputSurface? Couldn't it be
owned by GpuProcessTransportFactory (on a per-compositor basis) and
predate/outlive the OutputSurfaces?

+      parent_client_id, client_id);
   surface_clients_[client_id] = parent_client_id;
 }
 
 void Compositor::RemoveSurfaceClient(uint32_t client_id) {
   auto it = surface_clients_.find(client_id);
   DCHECK(it != surface_clients_.end());
-  if (host_->has_output_surface()) {
-    context_factory_->GetSurfaceManager()->UnregisterSurfaceNamespaceHierarchy(
-        it->second, client_id);
-  }
+  DCHECK(it->second);
+  context_factory_->GetSurfaceManager()->UnregisterSurfaceNamespaceHierarchy(
+      it->second, it->first);
   surface_clients_.erase(it);
 }
 
 void Compositor::SetOutputSurface(
     std::unique_ptr<cc::OutputSurface> output_surface) {
   output_surface_requested_ = false;
   host_->SetOutputSurface(std::move(output_surface));
-  // ui::Compositor uses a SingleThreadProxy and so BindToClient will be called
-  // above and SurfaceManager will be made aware of the OutputSurface's client
-  // ID.
-  for (auto& client : surface_clients_) {
-    if (client.second == surface_id_allocator_->client_id())
-      continue;
-    // If a client already has a parent, then we unregister the existing parent.
-    if (client.second) {
-      context_factory_->GetSurfaceManager()
-          ->UnregisterSurfaceNamespaceHierarchy(client.second, client.first);
-    }
-    context_factory_->GetSurfaceManager()->RegisterSurfaceNamespaceHierarchy(
-        surface_id_allocator_->client_id(), client.first);
-    client.second = surface_id_allocator_->client_id();
-  }
   // Visibility is reset when the output surface is lost, so update it to match
   // the Compositor's.
   context_factory_->SetDisplayVisible(this, host_->visible());
 }
 
 void Compositor::ScheduleDraw() {
   host_->SetNeedsCommit();
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
@@ skipping 103 matching lines @@
   // This function should only get called once.
   DCHECK(!widget_valid_);
   widget_ = widget;
   widget_valid_ = true;
   if (output_surface_requested_)
     context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr());
 }
 
 gfx::AcceleratedWidget Compositor::ReleaseAcceleratedWidget() {
   DCHECK(!IsVisible());
-  if (!host_->output_surface_lost()) {
-    host_->ReleaseOutputSurface();
-    for (auto& client : surface_clients_) {
-      context_factory_->GetSurfaceManager()
-          ->UnregisterSurfaceNamespaceHierarchy(client.second, client.first);
-      client.second = 0;
-    }
-  }
+  host_->ReleaseOutputSurface();
   context_factory_->RemoveCompositor(this);
   widget_valid_ = false;
   gfx::AcceleratedWidget widget = widget_;
   widget_ = gfx::kNullAcceleratedWidget;
   return widget;
 }
 
 gfx::AcceleratedWidget Compositor::widget() const {
   DCHECK(widget_valid_);
   return widget_;
@@ skipping 60 matching lines @@
 
 void Compositor::UpdateLayerTreeHost() {
   if (!root_layer())
     return;
   SendDamagedRectsRecursive(root_layer());
 }
 
 void Compositor::RequestNewOutputSurface() {
   DCHECK(!output_surface_requested_);
   output_surface_requested_ = true;
-  if (widget_valid_) {
+  if (widget_valid_)
     context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr());
-  }
 }
 
 void Compositor::DidInitializeOutputSurface() {
 }
 
 void Compositor::DidFailToInitializeOutputSurface() {
   // The OutputSurface should already be bound/initialized before being given to
   // the Compositor.
   NOTREACHED();
 }
@@ skipping 61 matching lines @@
                     observer_list_,
                     OnCompositingLockStateChanged(this));
 }
 
 void Compositor::CancelCompositorLock() {
   if (compositor_lock_)
     compositor_lock_->CancelLock();
 }
 
 }  // namespace ui