Index: cc/layers/layer_impl.cc |
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc |
index f0d54ff503e636d968109fcf82f4786480d0dfa6..88885f0d1f02e5978378c1d943c9de00ce7cf7f3 100644 |
--- a/cc/layers/layer_impl.cc |
+++ b/cc/layers/layer_impl.cc |
@@ -379,7 +379,7 @@ RenderPassId LayerImpl::NextContributingRenderPassId(RenderPassId id) const { |
return RenderPassId(0, 0); |
} |
-void LayerImpl::GetContentsResourceId(ResourceProvider::ResourceId* resource_id, |
+void LayerImpl::GetContentsResourceId(ResourceId* resource_id, |
gfx::Size* resource_size) const { |
NOTREACHED(); |
*resource_id = 0; |
@@ -749,9 +749,8 @@ void LayerImpl::NoteLayerPropertyChangedForDescendants() { |
#if DCHECK_IS_ON() |
// Verify that the resource id is valid. |
-static ResourceProvider::ResourceId ValidateResource( |
- const ResourceProvider* provider, |
- ResourceProvider::ResourceId id) { |
+static ResourceId ValidateResource(const ResourceProvider* provider, |
+ ResourceId id) { |
provider->ValidateResource(id); |
return id; |
} |