| 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 "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
| 9 #include "cc/resources/resource_provider.h" | 9 #include "cc/resources/resource_provider.h" |
| 10 #include "third_party/khronos/GLES2/gl2.h" | |
| 11 #include "ui/gfx/geometry/size.h" | 10 #include "ui/gfx/geometry/size.h" |
| 12 | 11 |
| 13 namespace cc { | 12 namespace cc { |
| 14 | 13 |
| 15 class CC_EXPORT Resource { | 14 class CC_EXPORT Resource { |
| 16 public: | 15 public: |
| 17 Resource() : id_(0) {} | 16 Resource() : id_(0) {} |
| 18 Resource(unsigned id, const gfx::Size& size, ResourceFormat format) | 17 Resource(unsigned id, const gfx::Size& size, ResourceFormat format) |
| 19 : id_(id), | 18 : id_(id), |
| 20 size_(size), | 19 size_(size), |
| (...skipping 21 matching lines...) Expand all Loading... |
| 42 ResourceProvider::ResourceId id_; | 41 ResourceProvider::ResourceId id_; |
| 43 gfx::Size size_; | 42 gfx::Size size_; |
| 44 ResourceFormat format_; | 43 ResourceFormat format_; |
| 45 | 44 |
| 46 DISALLOW_COPY_AND_ASSIGN(Resource); | 45 DISALLOW_COPY_AND_ASSIGN(Resource); |
| 47 }; | 46 }; |
| 48 | 47 |
| 49 } // namespace cc | 48 } // namespace cc |
| 50 | 49 |
| 51 #endif // CC_RESOURCES_RESOURCE_H_ | 50 #endif // CC_RESOURCES_RESOURCE_H_ |
| OLD | NEW |