Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Side by Side Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 2029323004: Get rid of virtual Display::CreateScheduler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onscreendisplayclient
Patch Set: displaytest: unusedvar Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/run_loop.h" 6 #include "base/run_loop.h"
6 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
7 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "cc/scheduler/begin_frame_source.h"
10 #include "cc/scheduler/delay_based_time_source.h"
8 #include "cc/test/fake_output_surface_client.h" 11 #include "cc/test/fake_output_surface_client.h"
9 #include "cc/test/test_context_provider.h" 12 #include "cc/test/test_context_provider.h"
10 #include "cc/test/test_web_graphics_context_3d.h" 13 #include "cc/test/test_web_graphics_context_3d.h"
11 #include "components/display_compositor/compositor_overlay_candidate_validator.h " 14 #include "components/display_compositor/compositor_overlay_candidate_validator.h "
12 #include "content/browser/compositor/browser_compositor_output_surface.h" 15 #include "content/browser/compositor/browser_compositor_output_surface.h"
13 #include "content/browser/compositor/reflector_impl.h" 16 #include "content/browser/compositor/reflector_impl.h"
14 #include "content/browser/compositor/reflector_texture.h" 17 #include "content/browser/compositor/reflector_texture.h"
15 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 18 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
16 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/compositor/compositor.h" 20 #include "ui/compositor/compositor.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 new TestOverlayCandidatesOzone()))); 70 new TestOverlayCandidatesOzone())));
68 #else 71 #else
69 return nullptr; 72 return nullptr;
70 #endif // defined(USE_OZONE) 73 #endif // defined(USE_OZONE)
71 } 74 }
72 75
73 class TestOutputSurface : public BrowserCompositorOutputSurface { 76 class TestOutputSurface : public BrowserCompositorOutputSurface {
74 public: 77 public:
75 TestOutputSurface(scoped_refptr<cc::ContextProvider> context_provider, 78 TestOutputSurface(scoped_refptr<cc::ContextProvider> context_provider,
76 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, 79 scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
77 base::SingleThreadTaskRunner* task_runner) 80 cc::SyntheticBeginFrameSource* begin_frame_source)
78 : BrowserCompositorOutputSurface(std::move(context_provider), 81 : BrowserCompositorOutputSurface(std::move(context_provider),
79 std::move(vsync_manager), 82 std::move(vsync_manager),
80 task_runner, 83 begin_frame_source,
81 CreateTestValidatorOzone()) { 84 CreateTestValidatorOzone()) {
82 surface_size_ = gfx::Size(256, 256); 85 surface_size_ = gfx::Size(256, 256);
83 device_scale_factor_ = 1.f; 86 device_scale_factor_ = 1.f;
84 } 87 }
85 88
86 void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; } 89 void SetFlip(bool flip) { capabilities_.flipped_output_surface = flip; }
87 90
88 void SwapBuffers(cc::CompositorFrame* frame) override {} 91 void SwapBuffers(cc::CompositorFrame* frame) override {}
89 92
90 void OnReflectorChanged() override { 93 void OnReflectorChanged() override {
(...skipping 29 matching lines...) Expand all
120 void SetUp() override { 123 void SetUp() override {
121 bool enable_pixel_output = false; 124 bool enable_pixel_output = false;
122 ui::ContextFactory* context_factory = 125 ui::ContextFactory* context_factory =
123 ui::InitializeContextFactoryForTests(enable_pixel_output); 126 ui::InitializeContextFactoryForTests(enable_pixel_output);
124 ImageTransportFactory::InitializeForUnitTests( 127 ImageTransportFactory::InitializeForUnitTests(
125 std::unique_ptr<ImageTransportFactory>( 128 std::unique_ptr<ImageTransportFactory>(
126 new NoTransportImageTransportFactory)); 129 new NoTransportImageTransportFactory));
127 message_loop_.reset(new base::MessageLoop()); 130 message_loop_.reset(new base::MessageLoop());
128 task_runner_ = message_loop_->task_runner(); 131 task_runner_ = message_loop_->task_runner();
129 compositor_task_runner_ = new FakeTaskRunner(); 132 compositor_task_runner_ = new FakeTaskRunner();
133 begin_frame_source_.reset(new cc::DelayBasedBeginFrameSource(
134 base::MakeUnique<cc::DelayBasedTimeSource>(
135 compositor_task_runner_.get())));
130 compositor_.reset( 136 compositor_.reset(
131 new ui::Compositor(context_factory, compositor_task_runner_.get())); 137 new ui::Compositor(context_factory, compositor_task_runner_.get()));
132 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget); 138 compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
133 output_surface_ = std::unique_ptr<TestOutputSurface>(new TestOutputSurface( 139 output_surface_ = base::MakeUnique<TestOutputSurface>(
134 cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()), 140 cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create()),
135 compositor_->vsync_manager(), compositor_task_runner_.get())); 141 compositor_->vsync_manager(), begin_frame_source_.get());
136 CHECK(output_surface_->BindToClient(&output_surface_client_)); 142 CHECK(output_surface_->BindToClient(&output_surface_client_));
137 143
138 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); 144 root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
139 compositor_->SetRootLayer(root_layer_.get()); 145 compositor_->SetRootLayer(root_layer_.get());
140 mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR)); 146 mirroring_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));
141 compositor_->root_layer()->Add(mirroring_layer_.get()); 147 compositor_->root_layer()->Add(mirroring_layer_.get());
142 gfx::Size size = output_surface_->SurfaceSize(); 148 gfx::Size size = output_surface_->SurfaceSize();
143 mirroring_layer_->SetBounds(gfx::Rect(size.width(), size.height())); 149 mirroring_layer_->SetBounds(gfx::Rect(size.width(), size.height()));
144 } 150 }
145 151
(...skipping 13 matching lines...) Expand all
159 } 165 }
160 compositor_.reset(); 166 compositor_.reset();
161 ui::TerminateContextFactoryForTests(); 167 ui::TerminateContextFactoryForTests();
162 ImageTransportFactory::Terminate(); 168 ImageTransportFactory::Terminate();
163 } 169 }
164 170
165 void UpdateTexture() { reflector_->OnSourcePostSubBuffer(kSubRect); } 171 void UpdateTexture() { reflector_->OnSourcePostSubBuffer(kSubRect); }
166 172
167 protected: 173 protected:
168 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; 174 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
175 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source_;
169 cc::FakeOutputSurfaceClient output_surface_client_; 176 cc::FakeOutputSurfaceClient output_surface_client_;
170 std::unique_ptr<base::MessageLoop> message_loop_; 177 std::unique_ptr<base::MessageLoop> message_loop_;
171 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 178 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
172 std::unique_ptr<ui::Compositor> compositor_; 179 std::unique_ptr<ui::Compositor> compositor_;
173 std::unique_ptr<ui::Layer> root_layer_; 180 std::unique_ptr<ui::Layer> root_layer_;
174 std::unique_ptr<ui::Layer> mirroring_layer_; 181 std::unique_ptr<ui::Layer> mirroring_layer_;
175 std::unique_ptr<ReflectorImpl> reflector_; 182 std::unique_ptr<ReflectorImpl> reflector_;
176 std::unique_ptr<TestOutputSurface> output_surface_; 183 std::unique_ptr<TestOutputSurface> output_surface_;
177 }; 184 };
178 185
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 plane_2.plane_z_order = 1; 223 plane_2.plane_z_order = 1;
217 list.push_back(plane_1); 224 list.push_back(plane_1);
218 list.push_back(plane_2); 225 list.push_back(plane_2);
219 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); 226 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
220 EXPECT_FALSE(list[0].overlay_handled); 227 EXPECT_FALSE(list[0].overlay_handled);
221 } 228 }
222 #endif // defined(USE_OZONE) 229 #endif // defined(USE_OZONE)
223 230
224 } // namespace 231 } // namespace
225 } // namespace content 232 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698