Index: cc/trees/layer_tree_host_impl.cc |
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc |
index 61253372be19003f42f111f0856321cc61acb389..a33be3cc8c81950393ad88ab56c2e07bb560c7ec 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -3248,7 +3248,7 @@ void LayerTreeHostImpl::CreateUIResource(UIResourceId uid, |
// Allow for multiple creation requests with the same UIResourceId. The |
// previous resource is simply deleted. |
- ResourceProvider::ResourceId id = ResourceIdForUIResource(uid); |
+ ResourceId id = ResourceIdForUIResource(uid); |
if (id) |
DeleteUIResource(uid); |
@@ -3281,7 +3281,7 @@ void LayerTreeHostImpl::CreateUIResource(UIResourceId uid, |
} |
void LayerTreeHostImpl::DeleteUIResource(UIResourceId uid) { |
- ResourceProvider::ResourceId id = ResourceIdForUIResource(uid); |
+ ResourceId id = ResourceIdForUIResource(uid); |
if (id) { |
resource_provider_->DeleteResource(id); |
ui_resource_map_.erase(uid); |
@@ -3306,8 +3306,7 @@ void LayerTreeHostImpl::EvictAllUIResources() { |
client_->RenewTreePriority(); |
} |
-ResourceProvider::ResourceId LayerTreeHostImpl::ResourceIdForUIResource( |
- UIResourceId uid) const { |
+ResourceId LayerTreeHostImpl::ResourceIdForUIResource(UIResourceId uid) const { |
UIResourceMap::const_iterator iter = ui_resource_map_.find(uid); |
if (iter != ui_resource_map_.end()) |
return iter->second.resource_id; |