Index: cc/trees/layer_tree_host_in_process.cc |
diff --git a/cc/trees/layer_tree_host_in_process.cc b/cc/trees/layer_tree_host_in_process.cc |
index 5755eb2248ab92266dd2e75f21cd960ed9504909..1222ccda151d333a3494be70b1deacd8664dcfdd 100644 |
--- a/cc/trees/layer_tree_host_in_process.cc |
+++ b/cc/trees/layer_tree_host_in_process.cc |
@@ -13,7 +13,6 @@ |
#include <string> |
#include <unordered_map> |
-#include "base/atomic_sequence_num.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
#include "base/location.h" |
@@ -63,10 +62,6 @@ |
#include "ui/gfx/geometry/size_conversions.h" |
#include "ui/gfx/geometry/vector2d_conversions.h" |
-namespace { |
-static base::StaticAtomicSequenceNumber s_layer_tree_host_sequence_number; |
-} |
- |
namespace cc { |
namespace { |
@@ -213,7 +208,7 @@ LayerTreeHostInProcess::LayerTreeHostInProcess( |
content_is_suitable_for_gpu_rasterization_(true), |
gpu_rasterization_histogram_recorded_(false), |
did_complete_scale_animation_(false), |
- id_(s_layer_tree_host_sequence_number.GetNext() + 1), |
+ id_(LayerTreeHost::GenerateHostId()), |
next_commit_forces_redraw_(false), |
shared_bitmap_manager_(params->shared_bitmap_manager), |
gpu_memory_buffer_manager_(params->gpu_memory_buffer_manager), |
@@ -358,7 +353,7 @@ const LayerTree* LayerTreeHostInProcess::GetLayerTree() const { |
return layer_tree_.get(); |
} |
-UIResourceManager* LayerTreeHostInProcess::GetUIResourceManager() const { |
+UIResourceManager* LayerTreeHostInProcess::GetUIResourceManager() { |
return ui_resource_manager_.get(); |
} |