WIP: Propagate SurfaceID up window tree hierarchy

cc/surfaces/direct_compositor_frame_sink.cc

 // Copyright 2014 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 "cc/surfaces/direct_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/surfaces/display.h"
@@ skipping 41 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   if (HasClient())
     DetachFromClient();
 }
 
 bool DirectCompositorFrameSink::BindToClient(
     CompositorFrameSinkClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   surface_manager_->RegisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id(), this);
+      surface_id_allocator_->frame_sink_id(), this);
 
   if (!CompositorFrameSink::BindToClient(client))
     return false;
 
   // We want the Display's output surface to hear about lost context, and since
   // this shares a context with it, we should not be listening for lost context
   // callbacks on the context here.
   if (context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
   // Avoid initializing GL context here, as this should be sharing the
   // Display's context.
   display_->Initialize(this, surface_manager_,
-                       surface_id_allocator_->client_id());
+                       surface_id_allocator_->frame_sink_id());
   return true;
 }
 
 void DirectCompositorFrameSink::DetachFromClient() {
   DCHECK(HasClient());
   // Unregister the SurfaceFactoryClient here instead of the dtor so that only
   // one client is alive for this namespace at any given time.
   surface_manager_->UnregisterSurfaceFactoryClient(
-      surface_id_allocator_->client_id());
+      surface_id_allocator_->frame_sink_id());
   if (!delegated_surface_id_.is_null())
     factory_.Destroy(delegated_surface_id_);
 
   CompositorFrameSink::DetachFromClient();
 }
 
 void DirectCompositorFrameSink::SwapBuffers(CompositorFrame frame) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
@@ skipping 49 matching lines @@
   // be drawn.
 }
 
 void DirectCompositorFrameSink::DidDrawCallback() {
   // TODO(danakj): Why the lost check?
   if (!is_lost_)
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc