| 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_RESOURCE_H_ | 5 #ifndef CC_RESOURCES_RESOURCE_H_ |
| 6 #define CC_RESOURCES_RESOURCE_H_ | 6 #define CC_RESOURCES_RESOURCE_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "cc/base/cc_export.h" | 9 #include "cc/base/cc_export.h" |
| 9 #include "cc/resources/resource_provider.h" | 10 #include "cc/resources/resource_provider.h" |
| 10 #include "cc/resources/resource_util.h" | 11 #include "cc/resources/resource_util.h" |
| 11 #include "ui/gfx/geometry/size.h" | 12 #include "ui/gfx/geometry/size.h" |
| 12 | 13 |
| 13 namespace cc { | 14 namespace cc { |
| 14 | 15 |
| 15 class CC_EXPORT Resource { | 16 class CC_EXPORT Resource { |
| 16 public: | 17 public: |
| 17 Resource() : id_(0), format_(RGBA_8888) {} | 18 Resource() : id_(0), format_(RGBA_8888) {} |
| (...skipping 17 matching lines...) Expand all Loading... |
| 35 ResourceId id_; | 36 ResourceId id_; |
| 36 gfx::Size size_; | 37 gfx::Size size_; |
| 37 ResourceFormat format_; | 38 ResourceFormat format_; |
| 38 | 39 |
| 39 DISALLOW_COPY_AND_ASSIGN(Resource); | 40 DISALLOW_COPY_AND_ASSIGN(Resource); |
| 40 }; | 41 }; |
| 41 | 42 |
| 42 } // namespace cc | 43 } // namespace cc |
| 43 | 44 |
| 44 #endif // CC_RESOURCES_RESOURCE_H_ | 45 #endif // CC_RESOURCES_RESOURCE_H_ |
| OLD | NEW |