| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 EXPECT_EQ(expected->transform_to_root_target, | 199 EXPECT_EQ(expected->transform_to_root_target, |
| 200 actual->transform_to_root_target); | 200 actual->transform_to_root_target); |
| 201 EXPECT_RECT_EQ(expected->damage_rect, actual->damage_rect); | 201 EXPECT_RECT_EQ(expected->damage_rect, actual->damage_rect); |
| 202 EXPECT_EQ(expected->has_transparent_background, | 202 EXPECT_EQ(expected->has_transparent_background, |
| 203 actual->has_transparent_background); | 203 actual->has_transparent_background); |
| 204 | 204 |
| 205 EXPECT_EQ(expected->shared_quad_state_list.size(), | 205 EXPECT_EQ(expected->shared_quad_state_list.size(), |
| 206 actual->shared_quad_state_list.size()); | 206 actual->shared_quad_state_list.size()); |
| 207 EXPECT_EQ(expected->quad_list.size(), actual->quad_list.size()); | 207 EXPECT_EQ(expected->quad_list.size(), actual->quad_list.size()); |
| 208 | 208 |
| 209 for (size_t i = 0; i < expected->quad_list.size(); ++i) { | 209 for (QuadList::Iterator exp_iter = expected->quad_list.begin(), |
| 210 EXPECT_EQ(expected->quad_list[i]->rect.ToString(), | 210 act_iter = actual->quad_list.begin(); |
| 211 actual->quad_list[i]->rect.ToString()); | 211 exp_iter != expected->quad_list.end(); |
| 212 EXPECT_EQ( | 212 ++exp_iter, ++act_iter) { |
| 213 expected->quad_list[i]->shared_quad_state->content_bounds.ToString(), | 213 EXPECT_EQ(exp_iter->rect.ToString(), act_iter->rect.ToString()); |
| 214 actual->quad_list[i]->shared_quad_state->content_bounds.ToString()); | 214 EXPECT_EQ(exp_iter->shared_quad_state->content_bounds.ToString(), |
| 215 act_iter->shared_quad_state->content_bounds.ToString()); |
| 215 } | 216 } |
| 216 } | 217 } |
| 217 } | 218 } |
| 218 | 219 |
| 219 TEST(OverlayTest, NoOverlaysByDefault) { | 220 TEST(OverlayTest, NoOverlaysByDefault) { |
| 220 scoped_refptr<TestContextProvider> provider = TestContextProvider::Create(); | 221 scoped_refptr<TestContextProvider> provider = TestContextProvider::Create(); |
| 221 OverlayOutputSurface output_surface(provider); | 222 OverlayOutputSurface output_surface(provider); |
| 222 EXPECT_EQ(NULL, output_surface.overlay_candidate_validator()); | 223 EXPECT_EQ(NULL, output_surface.overlay_candidate_validator()); |
| 223 | 224 |
| 224 output_surface.InitWithSingleOverlayValidator(); | 225 output_surface.InitWithSingleOverlayValidator(); |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 ASSERT_EQ(1U, pass_list.size()); | 302 ASSERT_EQ(1U, pass_list.size()); |
| 302 ASSERT_EQ(2U, candidate_list.size()); | 303 ASSERT_EQ(2U, candidate_list.size()); |
| 303 | 304 |
| 304 RenderPass* main_pass = pass_list.back(); | 305 RenderPass* main_pass = pass_list.back(); |
| 305 // Check that the quad is gone. | 306 // Check that the quad is gone. |
| 306 EXPECT_EQ(2U, main_pass->quad_list.size()); | 307 EXPECT_EQ(2U, main_pass->quad_list.size()); |
| 307 const QuadList& quad_list = main_pass->quad_list; | 308 const QuadList& quad_list = main_pass->quad_list; |
| 308 for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin(); | 309 for (QuadList::ConstBackToFrontIterator it = quad_list.BackToFrontBegin(); |
| 309 it != quad_list.BackToFrontEnd(); | 310 it != quad_list.BackToFrontEnd(); |
| 310 ++it) { | 311 ++it) { |
| 311 EXPECT_NE(DrawQuad::TEXTURE_CONTENT, (*it)->material); | 312 EXPECT_NE(DrawQuad::TEXTURE_CONTENT, it->material); |
| 312 } | 313 } |
| 313 | 314 |
| 314 // Check that the right resource id got extracted. | 315 // Check that the right resource id got extracted. |
| 315 EXPECT_EQ(original_resource_id, candidate_list.back().resource_id); | 316 EXPECT_EQ(original_resource_id, candidate_list.back().resource_id); |
| 316 } | 317 } |
| 317 | 318 |
| 318 TEST_F(SingleOverlayOnTopTest, NoCandidates) { | 319 TEST_F(SingleOverlayOnTopTest, NoCandidates) { |
| 319 scoped_ptr<RenderPass> pass = CreateRenderPass(); | 320 scoped_ptr<RenderPass> pass = CreateRenderPass(); |
| 320 CreateFullscreenCheckeredQuad(resource_provider_.get(), | 321 CreateFullscreenCheckeredQuad(resource_provider_.get(), |
| 321 pass->shared_quad_state_list.back(), | 322 pass->shared_quad_state_list.back(), |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 renderer_->set_expect_overlays(false); | 781 renderer_->set_expect_overlays(false); |
| 781 renderer_->FinishDrawingFrame(&frame3); | 782 renderer_->FinishDrawingFrame(&frame3); |
| 782 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); | 783 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); |
| 783 SwapBuffers(); | 784 SwapBuffers(); |
| 784 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 785 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
| 785 Mock::VerifyAndClearExpectations(&scheduler_); | 786 Mock::VerifyAndClearExpectations(&scheduler_); |
| 786 } | 787 } |
| 787 | 788 |
| 788 } // namespace | 789 } // namespace |
| 789 } // namespace cc | 790 } // namespace cc |
| OLD | NEW |