| Index: cc/proxy.cc
|
| diff --git a/cc/proxy.cc b/cc/proxy.cc
|
| index bc5ae69a57b362022d0022cc5c4a2b7e4d7e8ef3..0ed550c813558ff8b9bf4ff27806e7b3a39fc261 100644
|
| --- a/cc/proxy.cc
|
| +++ b/cc/proxy.cc
|
| @@ -13,7 +13,7 @@ using namespace WTF;
|
| namespace cc {
|
|
|
| namespace {
|
| -#ifndef NDEBUG
|
| +#if CC_DCHECK_ENABLED()
|
| bool implThreadIsOverridden = false;
|
| bool s_isMainThreadBlocked = false;
|
| base::PlatformThreadId threadIDOverridenToBeImplThread;
|
| @@ -57,10 +57,10 @@ CCThread* CCProxy::currentThread()
|
| return 0;
|
| }
|
|
|
| -#ifndef NDEBUG
|
| +#if CC_DCHECK_ENABLED()
|
| bool CCProxy::isMainThread()
|
| {
|
| - ASSERT(s_mainThread);
|
| + CC_DCHECK(s_mainThread);
|
| if (implThreadIsOverridden && base::PlatformThread::CurrentId() == threadIDOverridenToBeImplThread)
|
| return false;
|
| return base::PlatformThread::CurrentId() == s_mainThread->threadID();
|
| @@ -94,12 +94,12 @@ void CCProxy::setMainThreadBlocked(bool isMainThreadBlocked)
|
|
|
| CCProxy::CCProxy()
|
| {
|
| - ASSERT(isMainThread());
|
| + CC_DCHECK(isMainThread());
|
| }
|
|
|
| CCProxy::~CCProxy()
|
| {
|
| - ASSERT(isMainThread());
|
| + CC_DCHECK(isMainThread());
|
| }
|
|
|
| }
|
|
|