WIP: Propagate SurfaceID up window tree hierarchy

cc/surfaces/display.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/display.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 50 matching lines @@
     for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
       Surface* surface = surface_manager_->GetSurfaceForId(id_entry.first);
       if (surface)
         surface->RunDrawCallbacks();
     }
   }
 }
 
 void Display::Initialize(DisplayClient* client,
                          SurfaceManager* surface_manager,
-                         uint32_t compositor_surface_namespace) {
+                         const FrameSinkId& frame_sink_id) {
   DCHECK(client);
   DCHECK(surface_manager);
   client_ = client;
   surface_manager_ = surface_manager;
-  compositor_surface_namespace_ = compositor_surface_namespace;
+  frame_sink_id_ = frame_sink_id;
 
   surface_manager_->AddObserver(this);
 
   // This must be done in Initialize() so that the caller can delay this until
   // they are ready to receive a BeginFrameSource.
   if (begin_frame_source_) {
     surface_manager_->RegisterBeginFrameSource(begin_frame_source_.get(),
-                                               compositor_surface_namespace_);
+                                               frame_sink_id_);
   }
 
   bool ok = output_surface_->BindToClient(this);
   // The context given to the Display's OutputSurface should already be
   // initialized, so Bind can not fail.
   DCHECK(ok);
   InitializeRenderer();
 }
 
 void Display::SetSurfaceId(const SurfaceId& id, float device_scale_factor) {
-  DCHECK_EQ(id.client_id(), compositor_surface_namespace_);
+  DCHECK(id.frame_sink_id() == frame_sink_id_);
   if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
     return;
 
   TRACE_EVENT0("cc", "Display::SetSurfaceId");
   current_surface_id_ = id;
   device_scale_factor_ = device_scale_factor;
 
   UpdateRootSurfaceResourcesLocked();
   if (scheduler_)
     scheduler_->SetNewRootSurface(id);
@@ skipping 323 matching lines @@
 const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 void Display::ForceImmediateDrawAndSwapIfPossible() {
   if (scheduler_)
     scheduler_->ForceImmediateSwapIfPossible();
 }
 
 }  // namespace cc