Update Surface ID Terminology

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/threading/thread_task_runner_handle.h"
@@ skipping 74 matching lines @@
     surface_manager_->RegisterBeginFrameSource(begin_frame_source_.get(),
                                                compositor_surface_namespace_);
   }
 
   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);
 }
 
-void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) {
-  DCHECK_EQ(id.id_namespace(), compositor_surface_namespace_);
+void Display::SetSurfaceId(const SurfaceId& id, float device_scale_factor) {
+  DCHECK_EQ(id.client_id(), compositor_surface_namespace_);
   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 288 matching lines @@
 
 void Display::SetTreeActivationCallback(const base::Closure& callback) {
   NOTREACHED();
 }
 
 void Display::SetFullRootLayerDamage() {
   if (aggregator_ && !current_surface_id_.is_null())
     aggregator_->SetFullDamageForSurface(current_surface_id_);
 }
 
-void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
+void Display::OnSurfaceDamaged(const SurfaceId& surface_id, bool* changed) {
   if (aggregator_ &&
       aggregator_->previous_contained_surfaces().count(surface_id)) {
     Surface* surface = surface_manager_->GetSurfaceForId(surface_id);
     if (surface) {
       const CompositorFrame& current_frame = surface->GetEligibleFrame();
       if (!current_frame.delegated_frame_data ||
           current_frame.delegated_frame_data->resource_list.empty()) {
         aggregator_->ReleaseResources(surface_id);
       }
     }
     if (scheduler_)
       scheduler_->SurfaceDamaged(surface_id);
     *changed = true;
   } else if (surface_id == current_surface_id_) {
     if (scheduler_)
       scheduler_->SurfaceDamaged(surface_id);
     *changed = true;
   }
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
-SurfaceId Display::CurrentSurfaceId() {
+const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc