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 "content/renderer/gpu/render_widget_compositor.h" | 5 #include "content/renderer/gpu/render_widget_compositor.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/run_loop.h" |
12 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
13 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
14 #include "cc/output/begin_frame_args.h" | 15 #include "cc/output/begin_frame_args.h" |
15 #include "cc/test/failure_output_surface.h" | 16 #include "cc/test/failure_output_surface.h" |
16 #include "cc/test/fake_external_begin_frame_source.h" | 17 #include "cc/test/fake_external_begin_frame_source.h" |
17 #include "cc/trees/layer_tree_host.h" | 18 #include "cc/trees/layer_tree_host.h" |
18 #include "components/scheduler/renderer/renderer_scheduler.h" | 19 #include "components/scheduler/renderer/renderer_scheduler.h" |
19 #include "content/public/test/mock_render_thread.h" | 20 #include "content/public/test/mock_render_thread.h" |
20 #include "content/renderer/render_widget.h" | 21 #include "content/renderer/render_widget.h" |
21 #include "content/test/fake_compositor_dependencies.h" | 22 #include "content/test/fake_compositor_dependencies.h" |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 compositor_delegate_.set_use_null_output_surface(use_null_output_surface); | 237 compositor_delegate_.set_use_null_output_surface(use_null_output_surface); |
237 compositor_delegate_.set_num_failures_before_success( | 238 compositor_delegate_.set_num_failures_before_success( |
238 num_failures_before_success); | 239 num_failures_before_success); |
239 render_widget_compositor_.SetUp(expected_successes, | 240 render_widget_compositor_.SetUp(expected_successes, |
240 expected_fallback_succeses); | 241 expected_fallback_succeses); |
241 render_widget_compositor_.setVisible(true); | 242 render_widget_compositor_.setVisible(true); |
242 base::ThreadTaskRunnerHandle::Get()->PostTask( | 243 base::ThreadTaskRunnerHandle::Get()->PostTask( |
243 FROM_HERE, | 244 FROM_HERE, |
244 base::Bind(&RenderWidgetCompositorOutputSurface::SynchronousComposite, | 245 base::Bind(&RenderWidgetCompositorOutputSurface::SynchronousComposite, |
245 base::Unretained(&render_widget_compositor_))); | 246 base::Unretained(&render_widget_compositor_))); |
246 base::MessageLoop::current()->Run(); | 247 base::RunLoop().Run(); |
247 render_widget_compositor_.AfterTest(); | 248 render_widget_compositor_.AfterTest(); |
248 } | 249 } |
249 | 250 |
250 protected: | 251 protected: |
251 base::MessageLoop ye_olde_message_loope_; | 252 base::MessageLoop ye_olde_message_loope_; |
252 MockRenderThread render_thread_; | 253 MockRenderThread render_thread_; |
253 FakeCompositorDependencies compositor_deps_; | 254 FakeCompositorDependencies compositor_deps_; |
254 FakeRenderWidgetCompositorDelegate compositor_delegate_; | 255 FakeRenderWidgetCompositorDelegate compositor_delegate_; |
255 RenderWidgetCompositorOutputSurface render_widget_compositor_; | 256 RenderWidgetCompositorOutputSurface render_widget_compositor_; |
256 | 257 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 } | 292 } |
292 | 293 |
293 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { | 294 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { |
294 // The first success is a fallback, but the next should not be a fallback. | 295 // The first success is a fallback, but the next should not be a fallback. |
295 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 296 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
296 1, 1); | 297 1, 1); |
297 } | 298 } |
298 | 299 |
299 } // namespace | 300 } // namespace |
300 } // namespace content | 301 } // namespace content |
OLD | NEW |