| 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 compositor_delegate_.set_use_null_output_surface(use_null_output_surface); | 234 compositor_delegate_.set_use_null_output_surface(use_null_output_surface); |
| 234 compositor_delegate_.set_num_failures_before_success( | 235 compositor_delegate_.set_num_failures_before_success( |
| 235 num_failures_before_success); | 236 num_failures_before_success); |
| 236 render_widget_compositor_.SetUp(expected_successes, | 237 render_widget_compositor_.SetUp(expected_successes, |
| 237 expected_fallback_succeses); | 238 expected_fallback_succeses); |
| 238 render_widget_compositor_.setVisible(true); | 239 render_widget_compositor_.setVisible(true); |
| 239 base::ThreadTaskRunnerHandle::Get()->PostTask( | 240 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 240 FROM_HERE, | 241 FROM_HERE, |
| 241 base::Bind(&RenderWidgetCompositorOutputSurface::SynchronousComposite, | 242 base::Bind(&RenderWidgetCompositorOutputSurface::SynchronousComposite, |
| 242 base::Unretained(&render_widget_compositor_))); | 243 base::Unretained(&render_widget_compositor_))); |
| 243 base::MessageLoop::current()->Run(); | 244 base::RunLoop().Run(); |
| 244 render_widget_compositor_.AfterTest(); | 245 render_widget_compositor_.AfterTest(); |
| 245 } | 246 } |
| 246 | 247 |
| 247 protected: | 248 protected: |
| 248 base::MessageLoop ye_olde_message_loope_; | 249 base::MessageLoop ye_olde_message_loope_; |
| 249 MockRenderThread render_thread_; | 250 MockRenderThread render_thread_; |
| 250 FakeCompositorDependencies compositor_deps_; | 251 FakeCompositorDependencies compositor_deps_; |
| 251 FakeRenderWidgetCompositorDelegate compositor_delegate_; | 252 FakeRenderWidgetCompositorDelegate compositor_delegate_; |
| 252 RenderWidgetCompositorOutputSurface render_widget_compositor_; | 253 RenderWidgetCompositorOutputSurface render_widget_compositor_; |
| 253 | 254 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 } | 289 } |
| 289 | 290 |
| 290 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { | 291 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { |
| 291 // The first success is a fallback, but the next should not be a fallback. | 292 // The first success is a fallback, but the next should not be a fallback. |
| 292 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 293 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
| 293 1, 1); | 294 1, 1); |
| 294 } | 295 } |
| 295 | 296 |
| 296 } // namespace | 297 } // namespace |
| 297 } // namespace content | 298 } // namespace content |
| OLD | NEW |