| 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_TRANSERABLE_RESOURCE_H_ | 5 #ifndef CC_TRANSERABLE_RESOURCE_H_ |
| 6 #define CC_TRANSERABLE_RESOURCE_H_ | 6 #define CC_TRANSERABLE_RESOURCE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "cc/cc_export.h" | 10 #include "cc/cc_export.h" |
| 11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
| 12 #include "third_party/khronos/GLES2/gl2.h" | 12 #include "third_party/khronos/GLES2/gl2.h" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorTransf
erableResourceList.h" | 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositorTransf
erableResourceList.h" |
| 14 | 14 |
| 15 namespace cc { | 15 namespace cc { |
| 16 | 16 |
| 17 struct Mailbox { | 17 struct Mailbox { |
| 18 Mailbox(); |
| 18 GLbyte name[64]; | 19 GLbyte name[64]; |
| 19 }; | 20 }; |
| 20 | 21 |
| 21 struct CC_EXPORT TransferableResource { | 22 struct CC_EXPORT TransferableResource { |
| 22 TransferableResource(); | 23 TransferableResource(); |
| 23 ~TransferableResource(); | 24 ~TransferableResource(); |
| 24 | 25 |
| 25 unsigned id; | 26 unsigned id; |
| 26 GLenum format; | 27 GLenum format; |
| 27 gfx::Size size; | 28 gfx::Size size; |
| 28 Mailbox mailbox; | 29 Mailbox mailbox; |
| 29 }; | 30 }; |
| 30 | 31 |
| 31 typedef std::vector<TransferableResource> TransferableResourceArray; | 32 typedef std::vector<TransferableResource> TransferableResourceArray; |
| 32 | 33 |
| 33 struct CC_EXPORT TransferableResourceList : | 34 struct CC_EXPORT TransferableResourceList : |
| 34 public NON_EXPORTED_BASE(WebKit::WebCompositorTransferableResourceList) { | 35 public NON_EXPORTED_BASE(WebKit::WebCompositorTransferableResourceList) { |
| 35 TransferableResourceList(); | 36 TransferableResourceList(); |
| 36 ~TransferableResourceList(); | 37 ~TransferableResourceList(); |
| 37 | 38 |
| 38 TransferableResourceArray resources; | 39 TransferableResourceArray resources; |
| 39 unsigned sync_point; | 40 unsigned sync_point; |
| 40 }; | 41 }; |
| 41 | 42 |
| 42 } // namespace cc | 43 } // namespace cc |
| 43 | 44 |
| 44 #endif // CC_TRANSERABLE_RESOURCE_H_ | 45 #endif // CC_TRANSERABLE_RESOURCE_H_ |
| OLD | NEW |