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 #include "cc/output/compositor_frame.h" | 5 #include "cc/output/compositor_frame.h" |
6 #include "cc/quads/render_pass.h" | 6 #include "cc/quads/render_pass.h" |
7 #include "cc/quads/solid_color_draw_quad.h" | 7 #include "cc/quads/solid_color_draw_quad.h" |
8 #include "cc/quads/surface_draw_quad.h" | 8 #include "cc/quads/surface_draw_quad.h" |
9 #include "cc/surfaces/surface.h" | 9 #include "cc/surfaces/surface.h" |
10 #include "cc/surfaces/surface_aggregator.h" | 10 #include "cc/surfaces/surface_aggregator.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 SharedQuadState* shared_state = render_pass->CreateAndAppendSharedQuadState(); | 51 SharedQuadState* shared_state = render_pass->CreateAndAppendSharedQuadState(); |
52 shared_state->SetAll(transform, layer_bounds, visible_layer_rect, clip_rect, | 52 shared_state->SetAll(transform, layer_bounds, visible_layer_rect, clip_rect, |
53 is_clipped, opacity, blend_mode, 0); | 53 is_clipped, opacity, blend_mode, 0); |
54 return shared_state; | 54 return shared_state; |
55 } | 55 } |
56 | 56 |
57 // Draws a very simple frame with no surface references. | 57 // Draws a very simple frame with no surface references. |
58 TEST_F(SurfacesPixelTest, DrawSimpleFrame) { | 58 TEST_F(SurfacesPixelTest, DrawSimpleFrame) { |
59 gfx::Rect rect(device_viewport_size_); | 59 gfx::Rect rect(device_viewport_size_); |
60 RenderPassId id(1, 1); | 60 RenderPassId id(1, 1); |
61 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 61 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
62 pass->SetNew(id, rect, rect, gfx::Transform()); | 62 pass->SetNew(id, rect, rect, gfx::Transform()); |
63 | 63 |
64 CreateAndAppendTestSharedQuadState( | 64 CreateAndAppendTestSharedQuadState( |
65 pass.get(), gfx::Transform(), device_viewport_size_); | 65 pass.get(), gfx::Transform(), device_viewport_size_); |
66 | 66 |
67 SolidColorDrawQuad* color_quad = | 67 SolidColorDrawQuad* color_quad = |
68 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 68 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
69 bool force_anti_aliasing_off = false; | 69 bool force_anti_aliasing_off = false; |
70 color_quad->SetNew(pass->shared_quad_state_list.back(), | 70 color_quad->SetNew(pass->shared_quad_state_list.back(), |
71 rect, | 71 rect, |
72 rect, | 72 rect, |
73 SK_ColorGREEN, | 73 SK_ColorGREEN, |
74 force_anti_aliasing_off); | 74 force_anti_aliasing_off); |
75 | 75 |
76 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 76 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 77 new DelegatedFrameData); |
77 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 78 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
78 | 79 |
79 scoped_ptr<CompositorFrame> root_frame(new CompositorFrame); | 80 std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame); |
80 root_frame->delegated_frame_data = std::move(delegated_frame_data); | 81 root_frame->delegated_frame_data = std::move(delegated_frame_data); |
81 | 82 |
82 SurfaceId root_surface_id = allocator_.GenerateId(); | 83 SurfaceId root_surface_id = allocator_.GenerateId(); |
83 factory_.Create(root_surface_id); | 84 factory_.Create(root_surface_id); |
84 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), | 85 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), |
85 SurfaceFactory::DrawCallback()); | 86 SurfaceFactory::DrawCallback()); |
86 | 87 |
87 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); | 88 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); |
88 scoped_ptr<CompositorFrame> aggregated_frame = | 89 std::unique_ptr<CompositorFrame> aggregated_frame = |
89 aggregator.Aggregate(root_surface_id); | 90 aggregator.Aggregate(root_surface_id); |
90 factory_.Destroy(root_surface_id); | 91 factory_.Destroy(root_surface_id); |
91 | 92 |
92 bool discard_alpha = false; | 93 bool discard_alpha = false; |
93 ExactPixelComparator pixel_comparator(discard_alpha); | 94 ExactPixelComparator pixel_comparator(discard_alpha); |
94 RenderPassList* pass_list = | 95 RenderPassList* pass_list = |
95 &aggregated_frame->delegated_frame_data->render_pass_list; | 96 &aggregated_frame->delegated_frame_data->render_pass_list; |
96 EXPECT_TRUE(RunPixelTest(pass_list, | 97 EXPECT_TRUE(RunPixelTest(pass_list, |
97 base::FilePath(FILE_PATH_LITERAL("green.png")), | 98 base::FilePath(FILE_PATH_LITERAL("green.png")), |
98 pixel_comparator)); | 99 pixel_comparator)); |
99 } | 100 } |
100 | 101 |
101 // Draws a frame with simple surface embedding. | 102 // Draws a frame with simple surface embedding. |
102 TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) { | 103 TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) { |
103 gfx::Size child_size(200, 100); | 104 gfx::Size child_size(200, 100); |
104 SurfaceId child_surface_id = allocator_.GenerateId(); | 105 SurfaceId child_surface_id = allocator_.GenerateId(); |
105 SurfaceId root_surface_id = allocator_.GenerateId(); | 106 SurfaceId root_surface_id = allocator_.GenerateId(); |
106 factory_.Create(child_surface_id); | 107 factory_.Create(child_surface_id); |
107 factory_.Create(root_surface_id); | 108 factory_.Create(root_surface_id); |
108 { | 109 { |
109 gfx::Rect rect(device_viewport_size_); | 110 gfx::Rect rect(device_viewport_size_); |
110 RenderPassId id(1, 1); | 111 RenderPassId id(1, 1); |
111 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 112 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
112 pass->SetNew(id, rect, rect, gfx::Transform()); | 113 pass->SetNew(id, rect, rect, gfx::Transform()); |
113 | 114 |
114 CreateAndAppendTestSharedQuadState( | 115 CreateAndAppendTestSharedQuadState( |
115 pass.get(), gfx::Transform(), device_viewport_size_); | 116 pass.get(), gfx::Transform(), device_viewport_size_); |
116 | 117 |
117 SurfaceDrawQuad* surface_quad = | 118 SurfaceDrawQuad* surface_quad = |
118 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 119 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
119 surface_quad->SetNew(pass->shared_quad_state_list.back(), | 120 surface_quad->SetNew(pass->shared_quad_state_list.back(), |
120 gfx::Rect(child_size), | 121 gfx::Rect(child_size), |
121 gfx::Rect(child_size), | 122 gfx::Rect(child_size), |
122 child_surface_id); | 123 child_surface_id); |
123 | 124 |
124 SolidColorDrawQuad* color_quad = | 125 SolidColorDrawQuad* color_quad = |
125 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 126 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
126 bool force_anti_aliasing_off = false; | 127 bool force_anti_aliasing_off = false; |
127 color_quad->SetNew(pass->shared_quad_state_list.back(), | 128 color_quad->SetNew(pass->shared_quad_state_list.back(), |
128 rect, | 129 rect, |
129 rect, | 130 rect, |
130 SK_ColorYELLOW, | 131 SK_ColorYELLOW, |
131 force_anti_aliasing_off); | 132 force_anti_aliasing_off); |
132 | 133 |
133 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 134 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 135 new DelegatedFrameData); |
134 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 136 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
135 | 137 |
136 scoped_ptr<CompositorFrame> root_frame(new CompositorFrame); | 138 std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame); |
137 root_frame->delegated_frame_data = std::move(delegated_frame_data); | 139 root_frame->delegated_frame_data = std::move(delegated_frame_data); |
138 | 140 |
139 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), | 141 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), |
140 SurfaceFactory::DrawCallback()); | 142 SurfaceFactory::DrawCallback()); |
141 } | 143 } |
142 | 144 |
143 { | 145 { |
144 gfx::Rect rect(child_size); | 146 gfx::Rect rect(child_size); |
145 RenderPassId id(1, 1); | 147 RenderPassId id(1, 1); |
146 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 148 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
147 pass->SetNew(id, rect, rect, gfx::Transform()); | 149 pass->SetNew(id, rect, rect, gfx::Transform()); |
148 | 150 |
149 CreateAndAppendTestSharedQuadState( | 151 CreateAndAppendTestSharedQuadState( |
150 pass.get(), gfx::Transform(), child_size); | 152 pass.get(), gfx::Transform(), child_size); |
151 | 153 |
152 SolidColorDrawQuad* color_quad = | 154 SolidColorDrawQuad* color_quad = |
153 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 155 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
154 bool force_anti_aliasing_off = false; | 156 bool force_anti_aliasing_off = false; |
155 color_quad->SetNew(pass->shared_quad_state_list.back(), | 157 color_quad->SetNew(pass->shared_quad_state_list.back(), |
156 rect, | 158 rect, |
157 rect, | 159 rect, |
158 SK_ColorBLUE, | 160 SK_ColorBLUE, |
159 force_anti_aliasing_off); | 161 force_anti_aliasing_off); |
160 | 162 |
161 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 163 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 164 new DelegatedFrameData); |
162 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 165 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
163 | 166 |
164 scoped_ptr<CompositorFrame> child_frame(new CompositorFrame); | 167 std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame); |
165 child_frame->delegated_frame_data = std::move(delegated_frame_data); | 168 child_frame->delegated_frame_data = std::move(delegated_frame_data); |
166 | 169 |
167 factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame), | 170 factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame), |
168 SurfaceFactory::DrawCallback()); | 171 SurfaceFactory::DrawCallback()); |
169 } | 172 } |
170 | 173 |
171 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); | 174 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); |
172 scoped_ptr<CompositorFrame> aggregated_frame = | 175 std::unique_ptr<CompositorFrame> aggregated_frame = |
173 aggregator.Aggregate(root_surface_id); | 176 aggregator.Aggregate(root_surface_id); |
174 | 177 |
175 bool discard_alpha = false; | 178 bool discard_alpha = false; |
176 ExactPixelComparator pixel_comparator(discard_alpha); | 179 ExactPixelComparator pixel_comparator(discard_alpha); |
177 RenderPassList* pass_list = | 180 RenderPassList* pass_list = |
178 &aggregated_frame->delegated_frame_data->render_pass_list; | 181 &aggregated_frame->delegated_frame_data->render_pass_list; |
179 EXPECT_TRUE(RunPixelTest(pass_list, | 182 EXPECT_TRUE(RunPixelTest(pass_list, |
180 base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), | 183 base::FilePath(FILE_PATH_LITERAL("blue_yellow.png")), |
181 pixel_comparator)); | 184 pixel_comparator)); |
182 factory_.Destroy(root_surface_id); | 185 factory_.Destroy(root_surface_id); |
(...skipping 14 matching lines...) Expand all Loading... |
197 SurfaceId left_child_id = allocator_.GenerateId(); | 200 SurfaceId left_child_id = allocator_.GenerateId(); |
198 SurfaceId right_child_id = allocator_.GenerateId(); | 201 SurfaceId right_child_id = allocator_.GenerateId(); |
199 SurfaceId root_surface_id = allocator_.GenerateId(); | 202 SurfaceId root_surface_id = allocator_.GenerateId(); |
200 factory_.Create(left_child_id); | 203 factory_.Create(left_child_id); |
201 factory_.Create(right_child_id); | 204 factory_.Create(right_child_id); |
202 factory_.Create(root_surface_id); | 205 factory_.Create(root_surface_id); |
203 | 206 |
204 { | 207 { |
205 gfx::Rect rect(device_viewport_size_); | 208 gfx::Rect rect(device_viewport_size_); |
206 RenderPassId id(1, 1); | 209 RenderPassId id(1, 1); |
207 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 210 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
208 pass->SetNew(id, rect, rect, gfx::Transform()); | 211 pass->SetNew(id, rect, rect, gfx::Transform()); |
209 | 212 |
210 gfx::Transform surface_transform; | 213 gfx::Transform surface_transform; |
211 CreateAndAppendTestSharedQuadState( | 214 CreateAndAppendTestSharedQuadState( |
212 pass.get(), surface_transform, device_viewport_size_); | 215 pass.get(), surface_transform, device_viewport_size_); |
213 | 216 |
214 SurfaceDrawQuad* left_surface_quad = | 217 SurfaceDrawQuad* left_surface_quad = |
215 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 218 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
216 left_surface_quad->SetNew(pass->shared_quad_state_list.back(), | 219 left_surface_quad->SetNew(pass->shared_quad_state_list.back(), |
217 gfx::Rect(child_size), | 220 gfx::Rect(child_size), |
218 gfx::Rect(child_size), | 221 gfx::Rect(child_size), |
219 left_child_id); | 222 left_child_id); |
220 | 223 |
221 surface_transform.Translate(100, 0); | 224 surface_transform.Translate(100, 0); |
222 CreateAndAppendTestSharedQuadState( | 225 CreateAndAppendTestSharedQuadState( |
223 pass.get(), surface_transform, device_viewport_size_); | 226 pass.get(), surface_transform, device_viewport_size_); |
224 | 227 |
225 SurfaceDrawQuad* right_surface_quad = | 228 SurfaceDrawQuad* right_surface_quad = |
226 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 229 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
227 right_surface_quad->SetNew(pass->shared_quad_state_list.back(), | 230 right_surface_quad->SetNew(pass->shared_quad_state_list.back(), |
228 gfx::Rect(child_size), | 231 gfx::Rect(child_size), |
229 gfx::Rect(child_size), | 232 gfx::Rect(child_size), |
230 right_child_id); | 233 right_child_id); |
231 | 234 |
232 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 235 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 236 new DelegatedFrameData); |
233 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 237 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
234 | 238 |
235 scoped_ptr<CompositorFrame> root_frame(new CompositorFrame); | 239 std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame); |
236 root_frame->delegated_frame_data = std::move(delegated_frame_data); | 240 root_frame->delegated_frame_data = std::move(delegated_frame_data); |
237 | 241 |
238 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), | 242 factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame), |
239 SurfaceFactory::DrawCallback()); | 243 SurfaceFactory::DrawCallback()); |
240 } | 244 } |
241 | 245 |
242 { | 246 { |
243 gfx::Rect rect(child_size); | 247 gfx::Rect rect(child_size); |
244 RenderPassId id(1, 1); | 248 RenderPassId id(1, 1); |
245 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 249 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
246 pass->SetNew(id, rect, rect, gfx::Transform()); | 250 pass->SetNew(id, rect, rect, gfx::Transform()); |
247 | 251 |
248 CreateAndAppendTestSharedQuadState( | 252 CreateAndAppendTestSharedQuadState( |
249 pass.get(), gfx::Transform(), child_size); | 253 pass.get(), gfx::Transform(), child_size); |
250 | 254 |
251 SolidColorDrawQuad* top_color_quad = | 255 SolidColorDrawQuad* top_color_quad = |
252 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 256 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
253 bool force_anti_aliasing_off = false; | 257 bool force_anti_aliasing_off = false; |
254 top_color_quad->SetNew(pass->shared_quad_state_list.back(), | 258 top_color_quad->SetNew(pass->shared_quad_state_list.back(), |
255 gfx::Rect(quad_size), | 259 gfx::Rect(quad_size), |
256 gfx::Rect(quad_size), | 260 gfx::Rect(quad_size), |
257 SK_ColorGREEN, | 261 SK_ColorGREEN, |
258 force_anti_aliasing_off); | 262 force_anti_aliasing_off); |
259 | 263 |
260 SolidColorDrawQuad* bottom_color_quad = | 264 SolidColorDrawQuad* bottom_color_quad = |
261 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 265 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
262 bottom_color_quad->SetNew(pass->shared_quad_state_list.back(), | 266 bottom_color_quad->SetNew(pass->shared_quad_state_list.back(), |
263 gfx::Rect(0, 100, 100, 100), | 267 gfx::Rect(0, 100, 100, 100), |
264 gfx::Rect(0, 100, 100, 100), | 268 gfx::Rect(0, 100, 100, 100), |
265 SK_ColorBLUE, | 269 SK_ColorBLUE, |
266 force_anti_aliasing_off); | 270 force_anti_aliasing_off); |
267 | 271 |
268 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 272 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 273 new DelegatedFrameData); |
269 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 274 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
270 | 275 |
271 scoped_ptr<CompositorFrame> child_frame(new CompositorFrame); | 276 std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame); |
272 child_frame->delegated_frame_data = std::move(delegated_frame_data); | 277 child_frame->delegated_frame_data = std::move(delegated_frame_data); |
273 | 278 |
274 factory_.SubmitCompositorFrame(left_child_id, std::move(child_frame), | 279 factory_.SubmitCompositorFrame(left_child_id, std::move(child_frame), |
275 SurfaceFactory::DrawCallback()); | 280 SurfaceFactory::DrawCallback()); |
276 } | 281 } |
277 | 282 |
278 { | 283 { |
279 gfx::Rect rect(child_size); | 284 gfx::Rect rect(child_size); |
280 RenderPassId id(1, 1); | 285 RenderPassId id(1, 1); |
281 scoped_ptr<RenderPass> pass = RenderPass::Create(); | 286 std::unique_ptr<RenderPass> pass = RenderPass::Create(); |
282 pass->SetNew(id, rect, rect, gfx::Transform()); | 287 pass->SetNew(id, rect, rect, gfx::Transform()); |
283 | 288 |
284 CreateAndAppendTestSharedQuadState( | 289 CreateAndAppendTestSharedQuadState( |
285 pass.get(), gfx::Transform(), child_size); | 290 pass.get(), gfx::Transform(), child_size); |
286 | 291 |
287 SolidColorDrawQuad* top_color_quad = | 292 SolidColorDrawQuad* top_color_quad = |
288 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 293 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
289 bool force_anti_aliasing_off = false; | 294 bool force_anti_aliasing_off = false; |
290 top_color_quad->SetNew(pass->shared_quad_state_list.back(), | 295 top_color_quad->SetNew(pass->shared_quad_state_list.back(), |
291 gfx::Rect(quad_size), | 296 gfx::Rect(quad_size), |
292 gfx::Rect(quad_size), | 297 gfx::Rect(quad_size), |
293 SK_ColorBLUE, | 298 SK_ColorBLUE, |
294 force_anti_aliasing_off); | 299 force_anti_aliasing_off); |
295 | 300 |
296 SolidColorDrawQuad* bottom_color_quad = | 301 SolidColorDrawQuad* bottom_color_quad = |
297 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); | 302 pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); |
298 bottom_color_quad->SetNew(pass->shared_quad_state_list.back(), | 303 bottom_color_quad->SetNew(pass->shared_quad_state_list.back(), |
299 gfx::Rect(0, 100, 100, 100), | 304 gfx::Rect(0, 100, 100, 100), |
300 gfx::Rect(0, 100, 100, 100), | 305 gfx::Rect(0, 100, 100, 100), |
301 SK_ColorGREEN, | 306 SK_ColorGREEN, |
302 force_anti_aliasing_off); | 307 force_anti_aliasing_off); |
303 | 308 |
304 scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData); | 309 std::unique_ptr<DelegatedFrameData> delegated_frame_data( |
| 310 new DelegatedFrameData); |
305 delegated_frame_data->render_pass_list.push_back(std::move(pass)); | 311 delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
306 | 312 |
307 scoped_ptr<CompositorFrame> child_frame(new CompositorFrame); | 313 std::unique_ptr<CompositorFrame> child_frame(new CompositorFrame); |
308 child_frame->delegated_frame_data = std::move(delegated_frame_data); | 314 child_frame->delegated_frame_data = std::move(delegated_frame_data); |
309 | 315 |
310 factory_.SubmitCompositorFrame(right_child_id, std::move(child_frame), | 316 factory_.SubmitCompositorFrame(right_child_id, std::move(child_frame), |
311 SurfaceFactory::DrawCallback()); | 317 SurfaceFactory::DrawCallback()); |
312 } | 318 } |
313 | 319 |
314 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); | 320 SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true); |
315 scoped_ptr<CompositorFrame> aggregated_frame = | 321 std::unique_ptr<CompositorFrame> aggregated_frame = |
316 aggregator.Aggregate(root_surface_id); | 322 aggregator.Aggregate(root_surface_id); |
317 | 323 |
318 bool discard_alpha = false; | 324 bool discard_alpha = false; |
319 ExactPixelComparator pixel_comparator(discard_alpha); | 325 ExactPixelComparator pixel_comparator(discard_alpha); |
320 RenderPassList* pass_list = | 326 RenderPassList* pass_list = |
321 &aggregated_frame->delegated_frame_data->render_pass_list; | 327 &aggregated_frame->delegated_frame_data->render_pass_list; |
322 EXPECT_TRUE(RunPixelTest( | 328 EXPECT_TRUE(RunPixelTest( |
323 pass_list, | 329 pass_list, |
324 base::FilePath(FILE_PATH_LITERAL("four_blue_green_checkers.png")), | 330 base::FilePath(FILE_PATH_LITERAL("four_blue_green_checkers.png")), |
325 pixel_comparator)); | 331 pixel_comparator)); |
326 | 332 |
327 factory_.Destroy(root_surface_id); | 333 factory_.Destroy(root_surface_id); |
328 factory_.Destroy(left_child_id); | 334 factory_.Destroy(left_child_id); |
329 factory_.Destroy(right_child_id); | 335 factory_.Destroy(right_child_id); |
330 } | 336 } |
331 | 337 |
332 } // namespace | 338 } // namespace |
333 } // namespace cc | 339 } // namespace cc |
334 | 340 |
335 #endif // !defined(OS_ANDROID) | 341 #endif // !defined(OS_ANDROID) |
OLD | NEW |