| Index: cc/trees/layer_tree_host.cc
|
| diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
|
| index a9d4e06dbc466f061444e699de75f904e4f9cc8d..4cdf670d0e85444b2769c601e9a9809f6901130f 100644
|
| --- a/cc/trees/layer_tree_host.cc
|
| +++ b/cc/trees/layer_tree_host.cc
|
| @@ -250,7 +250,7 @@ LayerTreeHost::LayerTreeHost(InitParams* params, CompositorMode mode)
|
| 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_);
|
|
|
| @@ -1296,12 +1296,12 @@ void LayerTreeHost::OnCommitForSwapPromises() {
|
| 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(
|
| @@ -1587,7 +1587,7 @@ void LayerTreeHost::ToProtobufForCommit(
|
|
|
| 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(
|
| @@ -1689,7 +1689,7 @@ void LayerTreeHost::FromProtobufForCommit(const proto::LayerTreeHost& proto) {
|
| 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();
|
| }
|
|
|
|
|