Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: cc/layers/layer_impl.cc

Issue 1144523003: Rename cc::ResourceProvider::ResourceId to cc::ResourceId and move it to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index c4e59d87f4cfec5780a909ba67c111c7feb4d528..a3cfbc716623e89734a588cb4dd84844d9abfa13 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;
@@ -748,9 +748,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;
}

Powered by Google App Engine
This is Rietveld 408576698