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

Unified Diff: cc/resources/resource_provider.cc

Issue 1096703006: cc: Some more cleanup and removing TODOs for validating resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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
« cc/layers/layer_impl.cc ('K') | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index a336d759463e8c57302019fb08970a7e8bedd0ef..97d0ca0636a732f0c75ac88962ddc9d3721d8967 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -863,8 +863,7 @@ ResourceProvider::Resource* ResourceProvider::InsertResource(
ResourceProvider::Resource* ResourceProvider::GetResource(ResourceId id) {
DCHECK(thread_checker_.CalledOnValidThread());
- // TODO(danakj): crbug.com/455931
- CHECK(id);
+ DCHECK(id);
ResourceMap::iterator it = resources_.find(id);
CHECK(it != resources_.end());
piman 2015/04/23 22:55:10 I wonder if this still triggers now. If not we cou
danakj 2015/04/23 22:57:12 We'll just crash later on *it->second, so ya we co
return &it->second;
@@ -2044,7 +2043,7 @@ GLint ResourceProvider::GetActiveTextureUnit(GLES2Interface* gl) {
return active_unit;
}
-void ResourceProvider::ValidateResource(ResourceId id) {
+void ResourceProvider::ValidateResource(ResourceId id) const {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(id);
DCHECK(resources_.find(id) != resources_.end());
« cc/layers/layer_impl.cc ('K') | « cc/resources/resource_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698