[WIP] cc: Plumb SurfaceId from clients

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 61 matching lines @@
   if (!compositor_)
     return;
   compositor_->UnlockCompositor();
   compositor_ = NULL;
 }
 
 Compositor::Compositor(ui::ContextFactory* context_factory,
                        scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : context_factory_(context_factory),
       root_layer_(NULL),
+      initialized_(false),
       widget_(gfx::kNullAcceleratedWidget),
       widget_valid_(false),
       output_surface_requested_(false),
-      surface_id_allocator_(context_factory->CreateSurfaceIdAllocator()),
+      surface_id_allocator_(base::WrapUnique(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) {
   root_web_layer_ = cc::Layer::Create();
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ skipping 326 matching lines @@
 }
 
 void Compositor::RequestNewOutputSurface() {
   DCHECK(!output_surface_requested_);
   output_surface_requested_ = true;
   if (widget_valid_)
     context_factory_->CreateOutputSurface(weak_ptr_factory_.GetWeakPtr());
 }
 
 void Compositor::DidInitializeOutputSurface() {
+  initialized_ = true;
+  FOR_EACH_OBSERVER(CompositorObserver, observer_list_,
+                    OnCompositingInitialized(this));
 }
 
 void Compositor::DidFailToInitializeOutputSurface() {
   // The OutputSurface should already be bound/initialized before being given to
   // the Compositor.
   NOTREACHED();
 }
 
 void Compositor::DidCommit() {
   DCHECK(!IsLocked());
@@ skipping 58 matching lines @@
                     observer_list_,
                     OnCompositingLockStateChanged(this));
 }
 
 void Compositor::CancelCompositorLock() {
   if (compositor_lock_)
     compositor_lock_->CancelLock();
 }
 
 }  // namespace ui