summaryrefslogtreecommitdiffstats
path: root/cc/scoped_resource.cc
diff options
context:
space:
mode:
authorskaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 07:36:20 +0000
committerskaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-16 07:36:20 +0000
commit46f4611b3448facc65f4cab99378f0e26878acc0 (patch)
treec73971eb28cdc4fb3972f4c9d78792d080e0ed70 /cc/scoped_resource.cc
parent8a08d9e4976206bf664106716c78a46fd8b220b6 (diff)
downloadchromium_src-46f4611b3448facc65f4cab99378f0e26878acc0.zip
chromium_src-46f4611b3448facc65f4cab99378f0e26878acc0.tar.gz
chromium_src-46f4611b3448facc65f4cab99378f0e26878acc0.tar.bz2
Switched cc::Resource and cc::ScopedResource to Chrome coding style.
BUG=144576,144577 Review URL: https://chromiumcodereview.appspot.com/11412022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scoped_resource.cc')
-rw-r--r--cc/scoped_resource.cc46
1 files changed, 21 insertions, 25 deletions
diff --git a/cc/scoped_resource.cc b/cc/scoped_resource.cc
index 34a6351..5295b55 100644
--- a/cc/scoped_resource.cc
+++ b/cc/scoped_resource.cc
@@ -6,46 +6,42 @@
namespace cc {
-ScopedResource::ScopedResource(ResourceProvider* resourceProvider)
- : m_resourceProvider(resourceProvider)
-{
- DCHECK(m_resourceProvider);
+ScopedResource::ScopedResource(ResourceProvider* resource_provider)
+ : resource_provider_(resource_provider) {
+ DCHECK(resource_provider_);
}
-ScopedResource::~ScopedResource()
-{
- free();
+ScopedResource::~ScopedResource() {
+ Free();
}
-bool ScopedResource::allocate(int pool, const gfx::Size& size, GLenum format, ResourceProvider::TextureUsageHint hint)
-{
- DCHECK(!id());
- DCHECK(!size.IsEmpty());
+bool ScopedResource::Allocate(int pool, const gfx::Size& size, GLenum format,
+ ResourceProvider::TextureUsageHint hint) {
+ DCHECK(!id());
+ DCHECK(!size.IsEmpty());
- setDimensions(size, format);
- setId(m_resourceProvider->createResource(pool, size, format, hint));
+ set_dimensions(size, format);
+ set_id(resource_provider_->createResource(pool, size, format, hint));
#ifndef NDEBUG
- m_allocateThreadIdentifier = base::PlatformThread::CurrentId();
+ allocate_thread_id_ = base::PlatformThread::CurrentId();
#endif
- return id();
+ return id();
}
-void ScopedResource::free()
-{
- if (id()) {
+void ScopedResource::Free() {
+ if (id()) {
#ifndef NDEBUG
- DCHECK(m_allocateThreadIdentifier == base::PlatformThread::CurrentId());
+ DCHECK(allocate_thread_id_ == base::PlatformThread::CurrentId());
#endif
- m_resourceProvider->deleteResource(id());
- }
- setId(0);
+ resource_provider_->deleteResource(id());
+ }
+ set_id(0);
}
-void ScopedResource::leak()
-{
- setId(0);
+void ScopedResource::Leak() {
+ set_id(0);
}
} // namespace cc