OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ | 5 #ifndef PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ |
6 #define PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ | 6 #define PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ |
7 | 7 |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 ImageLayer() | 71 ImageLayer() |
72 : resource(0), | 72 : resource(0), |
73 source_rect(PP_MakeFloatRectFromXYWH(0.0f, 0.0f, 0.0f, 0.0f)) {} | 73 source_rect(PP_MakeFloatRectFromXYWH(0.0f, 0.0f, 0.0f, 0.0f)) {} |
74 | 74 |
75 PP_Resource resource; | 75 PP_Resource resource; |
76 PP_FloatRect source_rect; | 76 PP_FloatRect source_rect; |
77 }; | 77 }; |
78 | 78 |
79 struct TextureLayer { | 79 struct TextureLayer { |
80 TextureLayer() | 80 TextureLayer() |
81 : sync_point(0), | 81 : target(0), |
| 82 sync_point(0), |
82 source_rect(PP_MakeFloatRectFromXYWH(0.0f, 0.0f, 1.0f, 1.0f)), | 83 source_rect(PP_MakeFloatRectFromXYWH(0.0f, 0.0f, 1.0f, 1.0f)), |
83 premult_alpha(true) {} | 84 premult_alpha(true) {} |
84 | 85 |
85 gpu::Mailbox mailbox; | 86 gpu::Mailbox mailbox; |
| 87 uint32_t target; |
86 uint32_t sync_point; | 88 uint32_t sync_point; |
87 PP_FloatRect source_rect; | 89 PP_FloatRect source_rect; |
88 bool premult_alpha; | 90 bool premult_alpha; |
89 }; | 91 }; |
90 | 92 |
91 CompositorLayerData() {} | 93 CompositorLayerData() {} |
92 | 94 |
93 CompositorLayerData(const CompositorLayerData& other) { | 95 CompositorLayerData(const CompositorLayerData& other) { |
94 *this = other; | 96 *this = other; |
95 } | 97 } |
(...skipping 14 matching lines...) Expand all Loading... |
110 | 112 |
111 LayerCommon common; | 113 LayerCommon common; |
112 scoped_ptr<ColorLayer> color; | 114 scoped_ptr<ColorLayer> color; |
113 scoped_ptr<TextureLayer> texture; | 115 scoped_ptr<TextureLayer> texture; |
114 scoped_ptr<ImageLayer> image; | 116 scoped_ptr<ImageLayer> image; |
115 }; | 117 }; |
116 | 118 |
117 } // namespace ppapi | 119 } // namespace ppapi |
118 | 120 |
119 #endif // PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ | 121 #endif // PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_ |
OLD | NEW |