diff --git a/cc/resources/display_resource_provider.cc b/cc/resources/display_resource_provider.cc index 439e68962c07f1..795364575bd045 100644 --- a/cc/resources/display_resource_provider.cc +++ b/cc/resources/display_resource_provider.cc @@ -15,9 +15,9 @@ using gpu::gles2::GLES2Interface; namespace cc { namespace { -// The Resouce id in DisplayResourceProvider starts from 2 to avoid conflicts -// with id from LayerTreeResourceProvider. -const unsigned int kInitialResourceId = 2; +// The resource id in DisplayResourceProvider starts from 2 to avoid +// conflicts with id from LayerTreeResourceProvider. +const unsigned int kDisplayInitialResourceId = 2; } // namespace DisplayResourceProvider::DisplayResourceProvider( @@ -30,7 +30,7 @@ DisplayResourceProvider::DisplayResourceProvider( gpu_memory_buffer_manager, false, resource_settings, - kInitialResourceId) {} + kDisplayInitialResourceId) {} DisplayResourceProvider::~DisplayResourceProvider() { while (!children_.empty()) diff --git a/cc/resources/layer_tree_resource_provider.cc b/cc/resources/layer_tree_resource_provider.cc index cdf8b5eb388222..788560d34df993 100644 --- a/cc/resources/layer_tree_resource_provider.cc +++ b/cc/resources/layer_tree_resource_provider.cc @@ -16,9 +16,9 @@ using gpu::gles2::GLES2Interface; namespace cc { namespace { -// The Resouce id in LayerTreeResourceProvider starts from 1 to avoid conflicts -// with id from DisplayResourceProvider. -const unsigned int kInitialResourceId = 1; +// The resource id in LayerTreeResourceProvider starts from 1 to avoid +// conflicts with id from DisplayResourceProvider. +const unsigned int kLayerTreeInitialResourceId = 1; } // namespace struct LayerTreeResourceProvider::ImportedResource { @@ -55,7 +55,7 @@ LayerTreeResourceProvider::LayerTreeResourceProvider( gpu_memory_buffer_manager, delegated_sync_points_required, resource_settings, - kInitialResourceId) {} + kLayerTreeInitialResourceId) {} LayerTreeResourceProvider::~LayerTreeResourceProvider() { for (auto& pair : imported_resources_) {