| Index: cc/single_thread_proxy.h
|
| diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
|
| index ed70b80fb944206a8650830b08744a9c8a9e4e58..35bd7cc650fbccfece6e9335cc1b87803a97e30f 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
|
| +#ifndef NDEBUG
|
| CCProxy::setCurrentThreadIsImplThread(true);
|
| #endif
|
| }
|
| ~DebugScopedSetImplThread()
|
| {
|
| -#if !ASSERT_DISABLED
|
| +#ifndef NDEBUG
|
| CCProxy::setCurrentThreadIsImplThread(false);
|
| #endif
|
| }
|
| @@ -108,13 +108,13 @@ class DebugScopedSetMainThread {
|
| public:
|
| DebugScopedSetMainThread()
|
| {
|
| -#if !ASSERT_DISABLED
|
| +#ifndef NDEBUG
|
| CCProxy::setCurrentThreadIsImplThread(false);
|
| #endif
|
| }
|
| ~DebugScopedSetMainThread()
|
| {
|
| -#if !ASSERT_DISABLED
|
| +#ifndef NDEBUG
|
| CCProxy::setCurrentThreadIsImplThread(true);
|
| #endif
|
| }
|
|
|