summaryrefslogtreecommitdiffstats
path: root/cc/scoped_texture.h
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 01:25:18 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 01:25:18 +0000
commite7f87cfba8e6f916dd88359ed9abf6ec6884d65d (patch)
tree289b3ec335cf58e6924f5a6fccd8e17ea1c6585a /cc/scoped_texture.h
parentbc3847a1ba39db7adec20aa9e0565f6e868e8480 (diff)
downloadchromium_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.h')
-rw-r--r--cc/scoped_texture.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/cc/scoped_texture.h b/cc/scoped_texture.h
index 5ca8acd..7e27fd5 100644
--- a/cc/scoped_texture.h
+++ b/cc/scoped_texture.h
@@ -7,10 +7,9 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "cc/dcheck.h"
#include "CCTexture.h"
-#if CC_DCHECK_ENABLED()
+#if !ASSERT_DISABLED
#include "base/threading/platform_thread.h"
#endif
@@ -36,7 +35,7 @@ protected:
private:
CCResourceProvider* m_resourceProvider;
-#if CC_DCHECK_ENABLED()
+#if !ASSERT_DISABLED
base::PlatformThreadId m_allocateThreadIdentifier;
#endif