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

Unified Diff: cc/single_thread_proxy.h

Issue 11048044: cc: Switch to Chromium DCHECKs and LOGs (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 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/shader.cc ('k') | cc/single_thread_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/single_thread_proxy.h
diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
index 2bbacefdf1034a967c19c9bb6f4c8382ef017767..d43d8748a2c43f2e6b507df7d4b943795f381c47 100644
--- a/cc/single_thread_proxy.h
+++ b/cc/single_thread_proxy.h
@@ -8,7 +8,7 @@
#include "CCAnimationEvents.h"
#include "CCLayerTreeHostImpl.h"
#include "CCProxy.h"
-#include <base/time.h>
+#include "base/time.h"
#include <limits>
namespace cc {
@@ -90,13 +90,13 @@ class DebugScopedSetImplThread {
public:
DebugScopedSetImplThread()
{
-#if !ASSERT_DISABLED
+#if CC_DCHECK_ENABLED()
CCProxy::setCurrentThreadIsImplThread(true);
#endif
}
~DebugScopedSetImplThread()
{
-#if !ASSERT_DISABLED
+#if CC_DCHECK_ENABLED()
CCProxy::setCurrentThreadIsImplThread(false);
#endif
}
@@ -108,13 +108,13 @@ class DebugScopedSetMainThread {
public:
DebugScopedSetMainThread()
{
-#if !ASSERT_DISABLED
+#if CC_DCHECK_ENABLED()
CCProxy::setCurrentThreadIsImplThread(false);
#endif
}
~DebugScopedSetMainThread()
{
-#if !ASSERT_DISABLED
+#if CC_DCHECK_ENABLED()
CCProxy::setCurrentThreadIsImplThread(true);
#endif
}
« no previous file with comments | « cc/shader.cc ('k') | cc/single_thread_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698