| OLD | NEW |
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CC_RESOURCES_SCOPED_RESOURCE_H_ | 5 #ifndef CC_RESOURCES_SCOPED_RESOURCE_H_ |
| 6 #define CC_RESOURCES_SCOPED_RESOURCE_H_ | 6 #define CC_RESOURCES_SCOPED_RESOURCE_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | |
| 9 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
| 12 #include "cc/resources/resource.h" | 12 #include "cc/resources/resource.h" |
| 13 | 13 |
| 14 #if DCHECK_IS_ON() | 14 #if DCHECK_IS_ON() |
| 15 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace cc { | 18 namespace cc { |
| 19 | 19 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 41 #if DCHECK_IS_ON() | 41 #if DCHECK_IS_ON() |
| 42 base::PlatformThreadId allocate_thread_id_; | 42 base::PlatformThreadId allocate_thread_id_; |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 DISALLOW_COPY_AND_ASSIGN(ScopedResource); | 45 DISALLOW_COPY_AND_ASSIGN(ScopedResource); |
| 46 }; | 46 }; |
| 47 | 47 |
| 48 } // namespace cc | 48 } // namespace cc |
| 49 | 49 |
| 50 #endif // CC_RESOURCES_SCOPED_RESOURCE_H_ | 50 #endif // CC_RESOURCES_SCOPED_RESOURCE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1539203002:
Switch to standard integer types in cc/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master