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

Unified Diff: cc/resources/resource_provider.cc

Issue 13051003: cpplint.py pass on cc/(base|debug|quads|resources)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix prioritized_resource_unittest Created 7 years, 9 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
« no previous file with comments | « cc/resources/resource_provider.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | 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 d9872514d5b12cc5ebf739fbba8ac59c955b69a2..e2b01e42f0d8bc4b9f66e219b4d76c600b951277 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -470,7 +470,7 @@ void ResourceProvider::UnlockForRead(ResourceId id) {
ResourceMap::iterator it = resources_.find(id);
CHECK(it != resources_.end());
Resource* resource = &it->second;
- DCHECK(resource->lock_for_read_count > 0);
+ DCHECK_GT(resource->lock_for_read_count, 0);
DCHECK(!resource->exported);
resource->lock_for_read_count--;
}
@@ -1187,7 +1187,7 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
storage_format,
size.width(),
size.height()));
- } else
+ } else {
GLC(context3d, context3d->texImage2D(GL_TEXTURE_2D,
0,
format,
@@ -1197,6 +1197,7 @@ void ResourceProvider::LazyAllocate(Resource* resource) {
format,
GL_UNSIGNED_BYTE,
NULL));
+ }
}
void ResourceProvider::EnableReadLockFences(ResourceProvider::ResourceId id,
« no previous file with comments | « cc/resources/resource_provider.h ('k') | cc/resources/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698