| 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_RESOURCE_H_ | 5 #ifndef CC_RESOURCES_RESOURCE_H_ |
| 6 #define CC_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/resource_provider.h" | 9 #include "cc/resources/resource_provider.h" |
| 10 #include "third_party/khronos/GLES2/gl2.h" | 10 #include "third_party/khronos/GLES2/gl2.h" |
| 11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
| 12 | 12 |
| 13 namespace cc { | 13 namespace cc { |
| 14 | 14 |
| 15 class CC_EXPORT Resource { | 15 class CC_EXPORT Resource { |
| 16 public: | 16 public: |
| 17 Resource() : id_(0) { } | 17 Resource() : id_(0) { } |
| 18 Resource(unsigned id, gfx::Size size, GLenum format) | 18 Resource(unsigned id, gfx::Size size, GLenum format) |
| 19 : id_(id), size_(size), format_(format) { } | 19 : id_(id), size_(size), format_(format) { } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 32 void set_dimensions(const gfx::Size&, GLenum format); | 32 void set_dimensions(const gfx::Size&, GLenum format); |
| 33 | 33 |
| 34 private: | 34 private: |
| 35 ResourceProvider::ResourceId id_; | 35 ResourceProvider::ResourceId id_; |
| 36 gfx::Size size_; | 36 gfx::Size size_; |
| 37 GLenum format_; | 37 GLenum format_; |
| 38 }; | 38 }; |
| 39 | 39 |
| 40 } // namespace cc | 40 } // namespace cc |
| 41 | 41 |
| 42 #endif // CC_RESOURCE_H_ | 42 #endif // CC_RESOURCES_RESOURCE_H_ |
| OLD | NEW |