| Index: cc/scoped_texture.h
|
| diff --git a/cc/scoped_texture.h b/cc/scoped_texture.h
|
| index 7e27fd59c5b3a5130d1dc930efabae990c7df423..5674c9d5acff268bc3805ad8b0d6bc8549ccc5a9 100644
|
| --- a/cc/scoped_texture.h
|
| +++ b/cc/scoped_texture.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/logging.h"
|
| #include "CCTexture.h"
|
|
|
| -#if !ASSERT_DISABLED
|
| +#ifndef NDEBUG
|
| #include "base/threading/platform_thread.h"
|
| #endif
|
|
|
| @@ -35,7 +36,7 @@ protected:
|
| private:
|
| CCResourceProvider* m_resourceProvider;
|
|
|
| -#if !ASSERT_DISABLED
|
| +#ifndef NDEBUG
|
| base::PlatformThreadId m_allocateThreadIdentifier;
|
| #endif
|
|
|
|
|