| 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/compositor_frame_metadata.h" | 6 #include "cc/output/compositor_frame_metadata.h" |
| 7 #include "cc/output/gl_renderer.h" | 7 #include "cc/output/gl_renderer.h" |
| 8 #include "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
| 9 #include "cc/output/output_surface_client.h" | 9 #include "cc/output/output_surface_client.h" |
| 10 #include "cc/output/overlay_candidate_validator.h" | 10 #include "cc/output/overlay_candidate_validator.h" |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 | 340 |
| 341 typedef OverlayTest<OverlayStrategySingleOnTop> SingleOverlayOnTopTest; | 341 typedef OverlayTest<OverlayStrategySingleOnTop> SingleOverlayOnTopTest; |
| 342 typedef OverlayTest<OverlayStrategyUnderlay> UnderlayTest; | 342 typedef OverlayTest<OverlayStrategyUnderlay> UnderlayTest; |
| 343 | 343 |
| 344 TEST_F(SingleOverlayOnTopTest, SuccessfullOverlay) { | 344 TEST_F(SingleOverlayOnTopTest, SuccessfullOverlay) { |
| 345 scoped_ptr<RenderPass> pass = CreateRenderPass(); | 345 scoped_ptr<RenderPass> pass = CreateRenderPass(); |
| 346 TextureDrawQuad* original_quad = | 346 TextureDrawQuad* original_quad = |
| 347 CreateFullscreenCandidateQuad(resource_provider_.get(), | 347 CreateFullscreenCandidateQuad(resource_provider_.get(), |
| 348 pass->shared_quad_state_list.back(), | 348 pass->shared_quad_state_list.back(), |
| 349 pass.get()); | 349 pass.get()); |
| 350 unsigned original_resource_id = original_quad->resource_id; | 350 unsigned original_resource_id = original_quad->resource_id(); |
| 351 | 351 |
| 352 // Add something behind it. | 352 // Add something behind it. |
| 353 CreateFullscreenCheckeredQuad(resource_provider_.get(), | 353 CreateFullscreenCheckeredQuad(resource_provider_.get(), |
| 354 pass->shared_quad_state_list.back(), | 354 pass->shared_quad_state_list.back(), |
| 355 pass.get()); | 355 pass.get()); |
| 356 CreateFullscreenCheckeredQuad(resource_provider_.get(), | 356 CreateFullscreenCheckeredQuad(resource_provider_.get(), |
| 357 pass->shared_quad_state_list.back(), | 357 pass->shared_quad_state_list.back(), |
| 358 pass.get()); | 358 pass.get()); |
| 359 | 359 |
| 360 RenderPassList pass_list; | 360 RenderPassList pass_list; |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 renderer_->BeginDrawingFrame(&frame3); | 1181 renderer_->BeginDrawingFrame(&frame3); |
| 1182 renderer_->FinishDrawingFrame(&frame3); | 1182 renderer_->FinishDrawingFrame(&frame3); |
| 1183 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); | 1183 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); |
| 1184 SwapBuffers(); | 1184 SwapBuffers(); |
| 1185 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 1185 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
| 1186 Mock::VerifyAndClearExpectations(&scheduler_); | 1186 Mock::VerifyAndClearExpectations(&scheduler_); |
| 1187 } | 1187 } |
| 1188 | 1188 |
| 1189 } // namespace | 1189 } // namespace |
| 1190 } // namespace cc | 1190 } // namespace cc |
| OLD | NEW |