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/base/scoped_ptr_vector.h" | 5 #include "cc/base/scoped_ptr_vector.h" |
6 #include "cc/output/gl_renderer.h" | 6 #include "cc/output/gl_renderer.h" |
7 #include "cc/output/output_surface.h" | 7 #include "cc/output/output_surface.h" |
8 #include "cc/output/output_surface_client.h" | 8 #include "cc/output/output_surface_client.h" |
9 #include "cc/output/overlay_candidate_validator.h" | 9 #include "cc/output/overlay_candidate_validator.h" |
10 #include "cc/output/overlay_processor.h" | 10 #include "cc/output/overlay_processor.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 EXPECT_EQ(expected->transform_to_root_target, | 196 EXPECT_EQ(expected->transform_to_root_target, |
197 actual->transform_to_root_target); | 197 actual->transform_to_root_target); |
198 EXPECT_RECT_EQ(expected->damage_rect, actual->damage_rect); | 198 EXPECT_RECT_EQ(expected->damage_rect, actual->damage_rect); |
199 EXPECT_EQ(expected->has_transparent_background, | 199 EXPECT_EQ(expected->has_transparent_background, |
200 actual->has_transparent_background); | 200 actual->has_transparent_background); |
201 | 201 |
202 EXPECT_EQ(expected->shared_quad_state_list.size(), | 202 EXPECT_EQ(expected->shared_quad_state_list.size(), |
203 actual->shared_quad_state_list.size()); | 203 actual->shared_quad_state_list.size()); |
204 EXPECT_EQ(expected->quad_list.size(), actual->quad_list.size()); | 204 EXPECT_EQ(expected->quad_list.size(), actual->quad_list.size()); |
205 | 205 |
206 for (size_t i = 0; i < expected->quad_list.size(); ++i) { | 206 for (QuadList::Iterator exp_iter = expected->quad_list.begin(), |
207 EXPECT_EQ(expected->quad_list[i]->rect.ToString(), | 207 act_iter = actual->quad_list.begin(); |
208 actual->quad_list[i]->rect.ToString()); | 208 exp_iter != expected->quad_list.end(); |
209 EXPECT_EQ( | 209 ++exp_iter, ++act_iter) { |
210 expected->quad_list[i]->shared_quad_state->content_bounds.ToString(), | 210 EXPECT_EQ(exp_iter->rect.ToString(), act_iter->rect.ToString()); |
211 actual->quad_list[i]->shared_quad_state->content_bounds.ToString()); | 211 EXPECT_EQ(exp_iter->shared_quad_state->content_bounds.ToString(), |
| 212 act_iter->shared_quad_state->content_bounds.ToString()); |
212 } | 213 } |
213 } | 214 } |
214 } | 215 } |
215 | 216 |
216 TEST(OverlayTest, NoOverlaysByDefault) { | 217 TEST(OverlayTest, NoOverlaysByDefault) { |
217 scoped_refptr<TestContextProvider> provider = TestContextProvider::Create(); | 218 scoped_refptr<TestContextProvider> provider = TestContextProvider::Create(); |
218 OverlayOutputSurface output_surface(provider); | 219 OverlayOutputSurface output_surface(provider); |
219 EXPECT_EQ(NULL, output_surface.overlay_candidate_validator()); | 220 EXPECT_EQ(NULL, output_surface.overlay_candidate_validator()); |
220 | 221 |
221 output_surface.InitWithSingleOverlayValidator(); | 222 output_surface.InitWithSingleOverlayValidator(); |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 ASSERT_EQ(1U, pass_list.size()); | 295 ASSERT_EQ(1U, pass_list.size()); |
295 ASSERT_EQ(2U, candidate_list.size()); | 296 ASSERT_EQ(2U, candidate_list.size()); |
296 | 297 |
297 RenderPass* main_pass = pass_list.back(); | 298 RenderPass* main_pass = pass_list.back(); |
298 // Check that the quad is gone. | 299 // Check that the quad is gone. |
299 EXPECT_EQ(2U, main_pass->quad_list.size()); | 300 EXPECT_EQ(2U, main_pass->quad_list.size()); |
300 const QuadList& quad_list = main_pass->quad_list; | 301 const QuadList& quad_list = main_pass->quad_list; |
301 for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin(); | 302 for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin(); |
302 it != quad_list.BackToFrontEnd(); | 303 it != quad_list.BackToFrontEnd(); |
303 ++it) { | 304 ++it) { |
304 EXPECT_NE(DrawQuad::TEXTURE_CONTENT, (*it)->material); | 305 EXPECT_NE(DrawQuad::TEXTURE_CONTENT, it->material); |
305 } | 306 } |
306 | 307 |
307 // Check that the right resource id got extracted. | 308 // Check that the right resource id got extracted. |
308 EXPECT_EQ(original_resource_id, candidate_list.back().resource_id); | 309 EXPECT_EQ(original_resource_id, candidate_list.back().resource_id); |
309 } | 310 } |
310 | 311 |
311 TEST_F(SingleOverlayOnTopTest, NoCandidates) { | 312 TEST_F(SingleOverlayOnTopTest, NoCandidates) { |
312 scoped_ptr<RenderPass> pass = CreateRenderPass(); | 313 scoped_ptr<RenderPass> pass = CreateRenderPass(); |
313 CreateFullscreenCheckeredQuad(resource_provider_.get(), | 314 CreateFullscreenCheckeredQuad(resource_provider_.get(), |
314 pass->shared_quad_state_list.back(), | 315 pass->shared_quad_state_list.back(), |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
774 renderer_->set_expect_overlays(false); | 775 renderer_->set_expect_overlays(false); |
775 renderer_->FinishDrawingFrame(&frame3); | 776 renderer_->FinishDrawingFrame(&frame3); |
776 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); | 777 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); |
777 SwapBuffers(); | 778 SwapBuffers(); |
778 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 779 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
779 Mock::VerifyAndClearExpectations(&scheduler_); | 780 Mock::VerifyAndClearExpectations(&scheduler_); |
780 } | 781 } |
781 | 782 |
782 } // namespace | 783 } // namespace |
783 } // namespace cc | 784 } // namespace cc |
OLD | NEW |