| Index: cc/trees/proxy.h
|
| diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h
|
| index c6f281b53568e54a96bad02ac9d9b0a574f8de22..32790ab36e340d57f3acbeee357d7afa6dde3384 100644
|
| --- a/cc/trees/proxy.h
|
| +++ b/cc/trees/proxy.h
|
| @@ -46,7 +46,7 @@ class CC_EXPORT Proxy {
|
| bool IsMainThread() const;
|
| bool IsImplThread() const;
|
| bool IsMainThreadBlocked() const;
|
| -#if DCHECK_IS_ON
|
| +#if !DCHECK_IS_OFF
|
| void SetMainThreadBlocked(bool is_main_thread_blocked);
|
| void SetCurrentThreadIsImplThread(bool is_impl_thread);
|
| #endif
|
| @@ -125,7 +125,7 @@ class CC_EXPORT Proxy {
|
| scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner_;
|
| scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_;
|
|
|
| -#if DCHECK_IS_ON
|
| +#if !DCHECK_IS_OFF
|
| const base::PlatformThreadId main_thread_id_;
|
| bool impl_thread_is_overridden_;
|
| bool is_main_thread_blocked_;
|
| @@ -134,7 +134,7 @@ class CC_EXPORT Proxy {
|
| DISALLOW_COPY_AND_ASSIGN(Proxy);
|
| };
|
|
|
| -#if DCHECK_IS_ON
|
| +#if !DCHECK_IS_OFF
|
| class DebugScopedSetMainThreadBlocked {
|
| public:
|
| explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) : proxy_(proxy) {
|
|
|