| 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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 } | 538 } |
| 539 | 539 |
| 540 private: | 540 private: |
| 541 bool expect_overlays_; | 541 bool expect_overlays_; |
| 542 }; | 542 }; |
| 543 | 543 |
| 544 class FakeRendererClient : public RendererClient { | 544 class FakeRendererClient : public RendererClient { |
| 545 public: | 545 public: |
| 546 // RendererClient methods. | 546 // RendererClient methods. |
| 547 virtual void SetFullRootLayerDamage() OVERRIDE {} | 547 virtual void SetFullRootLayerDamage() OVERRIDE {} |
| 548 virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) OVERRIDE {} | |
| 549 }; | 548 }; |
| 550 | 549 |
| 551 class MockOverlayScheduler { | 550 class MockOverlayScheduler { |
| 552 public: | 551 public: |
| 553 MOCK_METHOD5(Schedule, | 552 MOCK_METHOD5(Schedule, |
| 554 void(int plane_z_order, | 553 void(int plane_z_order, |
| 555 gfx::OverlayTransform plane_transform, | 554 gfx::OverlayTransform plane_transform, |
| 556 unsigned overlay_texture_id, | 555 unsigned overlay_texture_id, |
| 557 const gfx::Rect& display_bounds, | 556 const gfx::Rect& display_bounds, |
| 558 const gfx::RectF& uv_rect)); | 557 const gfx::RectF& uv_rect)); |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 renderer_->set_expect_overlays(false); | 774 renderer_->set_expect_overlays(false); |
| 776 renderer_->FinishDrawingFrame(&frame3); | 775 renderer_->FinishDrawingFrame(&frame3); |
| 777 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); | 776 EXPECT_TRUE(resource_provider_->InUseByConsumer(resource1)); |
| 778 SwapBuffers(); | 777 SwapBuffers(); |
| 779 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 778 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
| 780 Mock::VerifyAndClearExpectations(&scheduler_); | 779 Mock::VerifyAndClearExpectations(&scheduler_); |
| 781 } | 780 } |
| 782 | 781 |
| 783 } // namespace | 782 } // namespace |
| 784 } // namespace cc | 783 } // namespace cc |
| OLD | NEW |