| 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_SCOPED_RESOURCE_H_ | 5 #ifndef CC_RESOURCES_SCOPED_RESOURCE_H_ |
| 6 #define CC_SCOPED_RESOURCE_H_ | 6 #define CC_RESOURCES_SCOPED_RESOURCE_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.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/resource.h" | 12 #include "cc/resources/resource.h" |
| 13 | 13 |
| 14 #ifndef NDEBUG | 14 #ifndef NDEBUG |
| 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 |
| 20 class CC_EXPORT ScopedResource : public Resource { | 20 class CC_EXPORT ScopedResource : public Resource { |
| 21 public: | 21 public: |
| 22 static scoped_ptr<ScopedResource> create( | 22 static scoped_ptr<ScopedResource> create( |
| (...skipping 15 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 #ifndef NDEBUG | 39 #ifndef NDEBUG |
| 40 base::PlatformThreadId allocate_thread_id_; | 40 base::PlatformThreadId allocate_thread_id_; |
| 41 #endif | 41 #endif |
| 42 | 42 |
| 43 DISALLOW_COPY_AND_ASSIGN(ScopedResource); | 43 DISALLOW_COPY_AND_ASSIGN(ScopedResource); |
| 44 }; | 44 }; |
| 45 | 45 |
| 46 } | 46 } |
| 47 | 47 |
| 48 #endif // CC_SCOPED_RESOURCE_H_ | 48 #endif // CC_RESOURCES_SCOPED_RESOURCE_H_ |
| OLD | NEW |