| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 return CreateCandidateVideoQuadAt(resource_provider, shared_quad_state, | 227 return CreateCandidateVideoQuadAt(resource_provider, shared_quad_state, |
| 228 render_pass, kOverlayRect, transform); | 228 render_pass, kOverlayRect, transform); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void CreateCheckeredQuadAt(ResourceProvider* resource_provider, | 231 void CreateCheckeredQuadAt(ResourceProvider* resource_provider, |
| 232 const SharedQuadState* shared_quad_state, | 232 const SharedQuadState* shared_quad_state, |
| 233 RenderPass* render_pass, | 233 RenderPass* render_pass, |
| 234 const gfx::Rect& rect) { | 234 const gfx::Rect& rect) { |
| 235 CheckerboardDrawQuad* checkerboard_quad = | 235 CheckerboardDrawQuad* checkerboard_quad = |
| 236 render_pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>(); | 236 render_pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>(); |
| 237 checkerboard_quad->SetNew(shared_quad_state, rect, rect, SkColor()); | 237 checkerboard_quad->SetNew(shared_quad_state, rect, rect, SkColor(), 1.f); |
| 238 } | 238 } |
| 239 | 239 |
| 240 void CreateFullscreenCheckeredQuad(ResourceProvider* resource_provider, | 240 void CreateFullscreenCheckeredQuad(ResourceProvider* resource_provider, |
| 241 const SharedQuadState* shared_quad_state, | 241 const SharedQuadState* shared_quad_state, |
| 242 RenderPass* render_pass) { | 242 RenderPass* render_pass) { |
| 243 CreateCheckeredQuadAt( | 243 CreateCheckeredQuadAt( |
| 244 resource_provider, shared_quad_state, render_pass, kOverlayRect); | 244 resource_provider, shared_quad_state, render_pass, kOverlayRect); |
| 245 } | 245 } |
| 246 | 246 |
| 247 static void CompareRenderPassLists(const RenderPassList& expected_list, | 247 static void CompareRenderPassLists(const RenderPassList& expected_list, |
| (...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1045 renderer_->BeginDrawingFrame(&frame3); | 1045 renderer_->BeginDrawingFrame(&frame3); |
| 1046 renderer_->FinishDrawingFrame(&frame3); | 1046 renderer_->FinishDrawingFrame(&frame3); |
| 1047 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); | 1047 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); |
| 1048 SwapBuffers(); | 1048 SwapBuffers(); |
| 1049 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 1049 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
| 1050 Mock::VerifyAndClearExpectations(&scheduler_); | 1050 Mock::VerifyAndClearExpectations(&scheduler_); |
| 1051 } | 1051 } |
| 1052 | 1052 |
| 1053 } // namespace | 1053 } // namespace |
| 1054 } // namespace cc | 1054 } // namespace cc |
| OLD | NEW |