Update Surface ID Terminology

cc/trees/layer_tree_host.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 232 matching lines @@
       event_listener_properties_(),
       animation_host_(std::move(params->animation_host)),
       did_complete_scale_animation_(false),
       in_paint_layer_contents_(false),
       id_(s_layer_tree_host_sequence_number.GetNext() + 1),
       next_commit_forces_redraw_(false),
       shared_bitmap_manager_(params->shared_bitmap_manager),
       gpu_memory_buffer_manager_(params->gpu_memory_buffer_manager),
       task_graph_runner_(params->task_graph_runner),
       image_serialization_processor_(params->image_serialization_processor),
-      surface_id_namespace_(0u),
+      surface_client_id_(0u),
       next_surface_sequence_(1u) {
   DCHECK(task_graph_runner_);
 
   DCHECK(animation_host_);
   animation_host_->SetMutatorHostClient(this);
 
   rendering_stats_instrumentation_->set_record_rendering_stats(
       debug_state_.RecordRenderingStats());
 }
 
@@ skipping 1025 matching lines @@
   for (const auto& swap_promise : swap_promise_list_)
     swap_promise->DidNotSwap(reason);
   swap_promise_list_.clear();
 }
 
 void LayerTreeHost::OnCommitForSwapPromises() {
   for (const auto& swap_promise : swap_promise_list_)
     swap_promise->OnCommit();
 }
 
-void LayerTreeHost::set_surface_id_namespace(uint32_t id_namespace) {
-  surface_id_namespace_ = id_namespace;
+void LayerTreeHost::set_surface_client_id(uint32_t client_id) {
+  surface_client_id_ = client_id;
 }
 
 SurfaceSequence LayerTreeHost::CreateSurfaceSequence() {
-  return SurfaceSequence(surface_id_namespace_, next_surface_sequence_++);
+  return SurfaceSequence(surface_client_id_, next_surface_sequence_++);
 }
 
 void LayerTreeHost::SetLayerTreeMutator(
     std::unique_ptr<LayerTreeMutator> mutator) {
   proxy_->SetMutator(std::move(mutator));
 }
 
 Layer* LayerTreeHost::LayerById(int id) const {
   LayerIdMap::const_iterator iter = layer_id_map_.find(id);
   return iter != layer_id_map_.end() ? iter->second : nullptr;
@@ skipping 265 matching lines @@
       inner_viewport_scroll_layer_ ? inner_viewport_scroll_layer_->id()
                                    : Layer::INVALID_ID);
   proto->set_outer_viewport_scroll_layer_id(
       outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id()
                                    : Layer::INVALID_ID);
 
   LayerSelectionToProtobuf(selection_, proto->mutable_selection());
 
   property_trees_.ToProtobuf(proto->mutable_property_trees());
 
-  proto->set_surface_id_namespace(surface_id_namespace_);
+  proto->set_surface_client_id(surface_client_id_);
   proto->set_next_surface_sequence(next_surface_sequence_);
 
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
       "cc.remote", "LayerTreeHostProto", source_frame_number_,
       ComputeLayerTreeHostProtoSizeSplitAsValue(proto));
 }
 
 void LayerTreeHost::FromProtobufForCommit(const proto::LayerTreeHost& proto) {
   DCHECK(client_picture_cache_);
 
@@ skipping 81 matching lines @@
   // Forcefully override the sequence number of all layers in the tree to have
   // a valid sequence number. Changing the sequence number for a layer does not
   // need a commit, so the value will become out of date for layers that are not
   // updated for other reasons. All layers that at this point are part of the
   // layer tree are valid, so it is OK that they have a valid sequence number.
   int seq_num = property_trees_.sequence_number;
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, [seq_num](Layer* layer) {
     layer->set_property_tree_sequence_number(seq_num);
   });
 
-  surface_id_namespace_ = proto.surface_id_namespace();
+  surface_client_id_ = proto.surface_client_id();
   next_surface_sequence_ = proto.next_surface_sequence();
 }
 
 }  // namespace cc