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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "cc/base/region.h" | 10 #include "cc/base/region.h" |
| 11 #include "cc/output/compositor_frame.h" |
11 #include "cc/output/compositor_frame_metadata.h" | 12 #include "cc/output/compositor_frame_metadata.h" |
12 #include "cc/output/gl_renderer.h" | 13 #include "cc/output/gl_renderer.h" |
13 #include "cc/output/output_surface.h" | 14 #include "cc/output/output_surface.h" |
14 #include "cc/output/output_surface_client.h" | 15 #include "cc/output/output_surface_client.h" |
15 #include "cc/output/overlay_candidate_validator.h" | 16 #include "cc/output/overlay_candidate_validator.h" |
16 #include "cc/output/overlay_processor.h" | 17 #include "cc/output/overlay_processor.h" |
17 #include "cc/output/overlay_strategy_single_on_top.h" | 18 #include "cc/output/overlay_strategy_single_on_top.h" |
18 #include "cc/output/overlay_strategy_underlay.h" | 19 #include "cc/output/overlay_strategy_underlay.h" |
19 #include "cc/quads/render_pass.h" | 20 #include "cc/quads/render_pass.h" |
20 #include "cc/quads/solid_color_draw_quad.h" | 21 #include "cc/quads/solid_color_draw_quad.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 | 148 |
148 // OutputSurface implementation | 149 // OutputSurface implementation |
149 void BindFramebuffer() override { | 150 void BindFramebuffer() override { |
150 OutputSurface::BindFramebuffer(); | 151 OutputSurface::BindFramebuffer(); |
151 bind_framebuffer_count_ += 1; | 152 bind_framebuffer_count_ += 1; |
152 } | 153 } |
153 uint32_t GetFramebufferCopyTextureFormat() override { | 154 uint32_t GetFramebufferCopyTextureFormat() override { |
154 // TestContextProvider has no real framebuffer, just use RGB. | 155 // TestContextProvider has no real framebuffer, just use RGB. |
155 return GL_RGB; | 156 return GL_RGB; |
156 } | 157 } |
157 void SwapBuffers(CompositorFrame* frame) override { | 158 void SwapBuffers(CompositorFrame frame) override { |
158 client_->DidSwapBuffers(); | 159 client_->DidSwapBuffers(); |
159 } | 160 } |
160 void OnSwapBuffersComplete() override { client_->DidSwapBuffersComplete(); } | 161 void OnSwapBuffersComplete() override { client_->DidSwapBuffersComplete(); } |
161 | 162 |
162 void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) { | 163 void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) { |
163 overlay_candidate_validator_.reset(validator); | 164 overlay_candidate_validator_.reset(validator); |
164 } | 165 } |
165 | 166 |
166 OverlayCandidateValidator* GetOverlayCandidateValidator() const override { | 167 OverlayCandidateValidator* GetOverlayCandidateValidator() const override { |
167 return overlay_candidate_validator_.get(); | 168 return overlay_candidate_validator_.get(); |
(...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1644 | 1645 |
1645 ReturnResourceInUseQuery(resource2); | 1646 ReturnResourceInUseQuery(resource2); |
1646 ReturnResourceInUseQuery(resource3); | 1647 ReturnResourceInUseQuery(resource3); |
1647 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 1648 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
1648 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2)); | 1649 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2)); |
1649 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource3)); | 1650 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource3)); |
1650 } | 1651 } |
1651 | 1652 |
1652 } // namespace | 1653 } // namespace |
1653 } // namespace cc | 1654 } // namespace cc |
OLD | NEW |