Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

components/exo/surface.cc

 // Copyright 2015 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 "components/exo/surface.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 176 matching lines @@
 }
 
 void SurfaceFactoryOwner::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // SurfaceFactoryOwner, private:
 
 SurfaceFactoryOwner::~SurfaceFactoryOwner() {
   if (surface_factory_->manager()) {
-    surface_factory_->manager()->InvalidateFrameSinkId(
-        id_allocator_->frame_sink_id());
+    surface_factory_->manager()->InvalidateFrameSinkId(frame_sink_id_);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Surface, public:
 
 Surface::Surface()
     : window_(new aura::Window(new CustomWindowDelegate(this))),
       surface_manager_(
           aura::Env::GetInstance()->context_factory()->GetSurfaceManager()),
       factory_owner_(new SurfaceFactoryOwner) {
   window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
   window_->SetName("ExoSurface");
   window_->SetProperty(kSurfaceKey, this);
   window_->Init(ui::LAYER_SOLID_COLOR);
   window_->set_layer_owner_delegate(this);
   window_->SetEventTargeter(base::WrapUnique(new CustomWindowTargeter));
   window_->set_owned_by_parent(false);
   factory_owner_->surface_ = this;
-  factory_owner_->id_allocator_.reset(new cc::SurfaceIdAllocator(
-      aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId()));
-  surface_manager_->RegisterFrameSinkId(
-      factory_owner_->id_allocator_->frame_sink_id());
-  factory_owner_->surface_factory_.reset(
-      new cc::SurfaceFactory(surface_manager_, factory_owner_.get()));
+  factory_owner_->frame_sink_id_ =
+      aura::Env::GetInstance()->context_factory()->AllocateFrameSinkId();
+  factory_owner_->id_allocator_.reset(
+      new cc::SurfaceIdAllocator(factory_owner_->frame_sink_id_));
+  surface_manager_->RegisterFrameSinkId(factory_owner_->frame_sink_id_);
+  factory_owner_->surface_factory_.reset(new cc::SurfaceFactory(
+      factory_owner_->frame_sink_id_, surface_manager_, factory_owner_.get()));
   aura::Env::GetInstance()->context_factory()->AddObserver(this);
 }
 
 Surface::~Surface() {
   aura::Env::GetInstance()->context_factory()->RemoveObserver(this);
   FOR_EACH_OBSERVER(SurfaceObserver, observers_, OnSurfaceDestroying(this));
 
   window_->layer()->SetShowSolidColorContent();
 
   factory_owner_->surface_ = nullptr;
@@ skipping 612 matching lines @@
 
 int64_t Surface::GetPropertyInternal(const void* key,
                                      int64_t default_value) const {
   std::map<const void*, Value>::const_iterator iter = prop_map_.find(key);
   if (iter == prop_map_.end())
     return default_value;
   return iter->second.value;
 }
 
 }  // namespace exo