diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 01:25:18 +0000 |
commit | e7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch) | |
tree | 289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/scoped_texture.cc | |
parent | bc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff) | |
download | chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.zip chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.gz chromium_src-e7f87cfba8e6f916dd88359ed9abf6ec6884d65d.tar.bz2 |
Revert "cc: Switch to Chromium DCHECKs LOGs"
This reverts commit 162296. (https://chromiumcodereview.appspot.com/11048044)
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11196014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scoped_texture.cc')
-rw-r--r-- | cc/scoped_texture.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/scoped_texture.cc b/cc/scoped_texture.cc index f5a5feb..d43ebe3 100644 --- a/cc/scoped_texture.cc +++ b/cc/scoped_texture.cc @@ -11,7 +11,7 @@ namespace cc { CCScopedTexture::CCScopedTexture(CCResourceProvider* resourceProvider) : m_resourceProvider(resourceProvider) { - DCHECK(m_resourceProvider); + ASSERT(m_resourceProvider); } CCScopedTexture::~CCScopedTexture() @@ -21,13 +21,13 @@ CCScopedTexture::~CCScopedTexture() bool CCScopedTexture::allocate(int pool, const IntSize& size, GC3Denum format, CCResourceProvider::TextureUsageHint hint) { - DCHECK(!id()); - DCHECK(!size.isEmpty()); + ASSERT(!id()); + ASSERT(!size.isEmpty()); setDimensions(size, format); setId(m_resourceProvider->createResource(pool, size, format, hint)); -#if CC_DCHECK_ENABLED() +#if !ASSERT_DISABLED m_allocateThreadIdentifier = base::PlatformThread::CurrentId(); #endif @@ -37,7 +37,7 @@ bool CCScopedTexture::allocate(int pool, const IntSize& size, GC3Denum format, C void CCScopedTexture::free() { if (id()) { - DCHECK(m_allocateThreadIdentifier == base::PlatformThread::CurrentId()); + ASSERT(m_allocateThreadIdentifier == base::PlatformThread::CurrentId()); m_resourceProvider->deleteResource(id()); } setId(0); |