OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/memory/ptr_util.h" | 5 #include "base/memory/ptr_util.h" |
6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "cc/output/output_surface_frame.h" | 9 #include "cc/output/output_surface_frame.h" |
10 #include "cc/scheduler/begin_frame_source.h" | 10 #include "cc/scheduler/begin_frame_source.h" |
11 #include "cc/scheduler/delay_based_time_source.h" | 11 #include "cc/scheduler/delay_based_time_source.h" |
12 #include "cc/test/fake_output_surface_client.h" | |
13 #include "cc/test/test_context_provider.h" | 12 #include "cc/test/test_context_provider.h" |
14 #include "cc/test/test_web_graphics_context_3d.h" | 13 #include "cc/test/test_web_graphics_context_3d.h" |
15 #include "components/display_compositor/compositor_overlay_candidate_validator.h
" | 14 #include "components/display_compositor/compositor_overlay_candidate_validator.h
" |
16 #include "content/browser/compositor/browser_compositor_output_surface.h" | 15 #include "content/browser/compositor/browser_compositor_output_surface.h" |
17 #include "content/browser/compositor/reflector_impl.h" | 16 #include "content/browser/compositor/reflector_impl.h" |
18 #include "content/browser/compositor/reflector_texture.h" | 17 #include "content/browser/compositor/reflector_texture.h" |
19 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 18 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
20 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
21 #include "ui/compositor/compositor.h" | 20 #include "ui/compositor/compositor.h" |
22 #include "ui/compositor/layer.h" | 21 #include "ui/compositor/layer.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, | 80 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, |
82 cc::SyntheticBeginFrameSource* begin_frame_source) | 81 cc::SyntheticBeginFrameSource* begin_frame_source) |
83 : BrowserCompositorOutputSurface(std::move(context_provider), | 82 : BrowserCompositorOutputSurface(std::move(context_provider), |
84 std::move(vsync_manager), | 83 std::move(vsync_manager), |
85 begin_frame_source, | 84 begin_frame_source, |
86 CreateTestValidatorOzone()) { | 85 CreateTestValidatorOzone()) { |
87 } | 86 } |
88 | 87 |
89 void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; } | 88 void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; } |
90 | 89 |
| 90 void BindToClient(cc::OutputSurfaceClient* client) override {} |
91 void EnsureBackbuffer() override {} | 91 void EnsureBackbuffer() override {} |
92 void DiscardBackbuffer() override {} | 92 void DiscardBackbuffer() override {} |
93 void BindFramebuffer() override {} | 93 void BindFramebuffer() override {} |
94 void Reshape(const gfx::Size& size, | 94 void Reshape(const gfx::Size& size, |
95 float device_scale_factor, | 95 float device_scale_factor, |
96 const gfx::ColorSpace& color_space, | 96 const gfx::ColorSpace& color_space, |
97 bool has_alpha) override {} | 97 bool has_alpha) override {} |
98 void SwapBuffers(cc::OutputSurfaceFrame frame) override {} | 98 void SwapBuffers(cc::OutputSurfaceFrame frame) override {} |
99 uint32_t GetFramebufferCopyTextureFormat() override { return GL_RGB; } | 99 uint32_t GetFramebufferCopyTextureFormat() override { return GL_RGB; } |
100 bool IsDisplayedAsOverlayPlane() const override { return false; } | 100 bool IsDisplayedAsOverlayPlane() const override { return false; } |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 new NoTransportImageTransportFactory)); | 134 new NoTransportImageTransportFactory)); |
135 message_loop_.reset(new base::MessageLoop()); | 135 message_loop_.reset(new base::MessageLoop()); |
136 task_runner_ = message_loop_->task_runner(); | 136 task_runner_ = message_loop_->task_runner(); |
137 compositor_task_runner_ = new FakeTaskRunner(); | 137 compositor_task_runner_ = new FakeTaskRunner(); |
138 begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource( | 138 begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource( |
139 base::MakeUnique<cc::DelayBasedTimeSource>( | 139 base::MakeUnique<cc::DelayBasedTimeSource>( |
140 compositor_task_runner_.get()))); | 140 compositor_task_runner_.get()))); |
141 compositor_.reset( | 141 compositor_.reset( |
142 new ui::Compositor(context_factory, compositor_task_runner_.get())); | 142 new ui::Compositor(context_factory, compositor_task_runner_.get())); |
143 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); | 143 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); |
| 144 |
| 145 auto context_provider = cc::TestContextProvider::Create(); |
| 146 context_provider->BindToCurrentThread(); |
144 output_surface_ = base::MakeUnique<TestOutputSurface>( | 147 output_surface_ = base::MakeUnique<TestOutputSurface>( |
145 cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()), | 148 std::move(context_provider), compositor_->vsync_manager(), |
146 compositor_->vsync_manager(), begin_frame_source_.get()); | 149 begin_frame_source_.get()); |
147 CHECK(output_surface_->BindToClient(&output_surface_client_)); | |
148 | 150 |
149 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); | 151 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); |
150 compositor_->SetRootLayer(root_layer_.get()); | 152 compositor_->SetRootLayer(root_layer_.get()); |
151 mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); | 153 mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); |
152 compositor_->root_layer()->Add(mirroring_layer_.get()); | 154 compositor_->root_layer()->Add(mirroring_layer_.get()); |
153 output_surface_->Reshape(kSurfaceSize, 1.f, gfx::ColorSpace(), false); | 155 output_surface_->Reshape(kSurfaceSize, 1.f, gfx::ColorSpace(), false); |
154 mirroring_layer_->SetBounds(gfx::Rect(kSurfaceSize)); | 156 mirroring_layer_->SetBounds(gfx::Rect(kSurfaceSize)); |
155 } | 157 } |
156 | 158 |
157 void SetUpReflector() { | 159 void SetUpReflector() { |
(...skipping 15 matching lines...) Expand all Loading... |
173 ImageTransportFactory::Terminate(); | 175 ImageTransportFactory::Terminate(); |
174 } | 176 } |
175 | 177 |
176 void UpdateTexture() { | 178 void UpdateTexture() { |
177 reflector_->OnSourcePostSubBuffer(kSubRect, kSurfaceSize); | 179 reflector_->OnSourcePostSubBuffer(kSubRect, kSurfaceSize); |
178 } | 180 } |
179 | 181 |
180 protected: | 182 protected: |
181 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; | 183 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
182 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source_; | 184 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source_; |
183 cc::FakeOutputSurfaceClient output_surface_client_; | |
184 std::unique_ptr<base::MessageLoop> message_loop_; | 185 std::unique_ptr<base::MessageLoop> message_loop_; |
185 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 186 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
186 std::unique_ptr<ui::Compositor> compositor_; | 187 std::unique_ptr<ui::Compositor> compositor_; |
187 std::unique_ptr<ui::Layer> root_layer_; | 188 std::unique_ptr<ui::Layer> root_layer_; |
188 std::unique_ptr<ui::Layer> mirroring_layer_; | 189 std::unique_ptr<ui::Layer> mirroring_layer_; |
189 std::unique_ptr<ReflectorImpl> reflector_; | 190 std::unique_ptr<ReflectorImpl> reflector_; |
190 std::unique_ptr<TestOutputSurface> output_surface_; | 191 std::unique_ptr<TestOutputSurface> output_surface_; |
191 }; | 192 }; |
192 | 193 |
193 namespace { | 194 namespace { |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 plane_2.plane_z_order = 1; | 230 plane_2.plane_z_order = 1; |
230 list.push_back(plane_1); | 231 list.push_back(plane_1); |
231 list.push_back(plane_2); | 232 list.push_back(plane_2); |
232 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 233 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
233 EXPECT_FALSE(list[0].overlay_handled); | 234 EXPECT_FALSE(list[0].overlay_handled); |
234 } | 235 } |
235 #endif // defined(USE_OZONE) | 236 #endif // defined(USE_OZONE) |
236 | 237 |
237 } // namespace | 238 } // namespace |
238 } // namespace content | 239 } // namespace content |
OLD | NEW |