| 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/run_loop.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "cc/output/begin_frame_args.h" | 15 #include "cc/output/begin_frame_args.h" |
| 16 #include "cc/output/copy_output_request.h" | 16 #include "cc/output/copy_output_request.h" |
| 17 #include "cc/test/failure_output_surface.h" | |
| 18 #include "cc/test/fake_external_begin_frame_source.h" | 17 #include "cc/test/fake_external_begin_frame_source.h" |
| 18 #include "cc/test/fake_output_surface.h" |
| 19 #include "cc/test/test_context_provider.h" |
| 19 #include "cc/trees/layer_tree_host.h" | 20 #include "cc/trees/layer_tree_host.h" |
| 20 #include "components/scheduler/renderer/renderer_scheduler.h" | 21 #include "components/scheduler/renderer/renderer_scheduler.h" |
| 21 #include "content/public/test/mock_render_thread.h" | 22 #include "content/public/test/mock_render_thread.h" |
| 22 #include "content/renderer/render_widget.h" | 23 #include "content/renderer/render_widget.h" |
| 23 #include "content/test/fake_compositor_dependencies.h" | 24 #include "content/test/fake_compositor_dependencies.h" |
| 24 #include "content/test/fake_renderer_scheduler.h" | 25 #include "content/test/fake_renderer_scheduler.h" |
| 26 #include "gpu/GLES2/gl2extchromium.h" |
| 25 #include "testing/gmock/include/gmock/gmock.h" | 27 #include "testing/gmock/include/gmock/gmock.h" |
| 26 #include "testing/gtest/include/gtest/gtest.h" | 28 #include "testing/gtest/include/gtest/gtest.h" |
| 27 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 29 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
| 28 | 30 |
| 29 using testing::AllOf; | 31 using testing::AllOf; |
| 30 using testing::Field; | 32 using testing::Field; |
| 31 | 33 |
| 32 namespace content { | 34 namespace content { |
| 33 namespace { | 35 namespace { |
| 34 | 36 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 public: | 75 public: |
| 74 FakeRenderWidgetCompositorDelegate() = default; | 76 FakeRenderWidgetCompositorDelegate() = default; |
| 75 | 77 |
| 76 std::unique_ptr<cc::OutputSurface> CreateOutputSurface( | 78 std::unique_ptr<cc::OutputSurface> CreateOutputSurface( |
| 77 bool fallback) override { | 79 bool fallback) override { |
| 78 EXPECT_EQ( | 80 EXPECT_EQ( |
| 79 num_requests_since_last_success_ > | 81 num_requests_since_last_success_ > |
| 80 RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 82 RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
| 81 fallback); | 83 fallback); |
| 82 last_create_was_fallback_ = fallback; | 84 last_create_was_fallback_ = fallback; |
| 85 |
| 83 bool success = num_failures_ >= num_failures_before_success_; | 86 bool success = num_failures_ >= num_failures_before_success_; |
| 84 if (success) { | 87 if (!success && use_null_output_surface_) |
| 85 std::unique_ptr<cc::TestWebGraphicsContext3D> context = | 88 return nullptr; |
| 86 cc::TestWebGraphicsContext3D::Create(); | 89 |
| 87 // Image support required for synchronous compositing. | 90 auto context_provider = cc::TestContextProvider::Create(); |
| 88 context->set_support_image(true); | 91 if (!success) { |
| 89 // Create delegating surface so that max_pending_frames = 1. | 92 context_provider->UnboundTestContext3d()->loseContextCHROMIUM( |
| 90 return cc::FakeOutputSurface::CreateDelegating3d(std::move(context)); | 93 GL_GUILTY_CONTEXT_RESET_ARB, GL_INNOCENT_CONTEXT_RESET_ARB); |
| 91 } | 94 } |
| 92 return use_null_output_surface_ | 95 |
| 93 ? nullptr | 96 // Create delegating surface so that max_pending_frames = 1. |
| 94 : base::WrapUnique(new cc::FailureOutputSurface(true)); | 97 return cc::FakeOutputSurface::CreateDelegating3d( |
| 98 std::move(context_provider)); |
| 95 } | 99 } |
| 96 | 100 |
| 97 std::unique_ptr<cc::BeginFrameSource> CreateExternalBeginFrameSource() | 101 std::unique_ptr<cc::BeginFrameSource> CreateExternalBeginFrameSource() |
| 98 override { | 102 override { |
| 99 double refresh_rate = 200.0; | 103 double refresh_rate = 200.0; |
| 100 bool tick_automatically = true; | 104 bool tick_automatically = true; |
| 101 return base::MakeUnique<cc::FakeExternalBeginFrameSource>( | 105 return base::MakeUnique<cc::FakeExternalBeginFrameSource>( |
| 102 refresh_rate, tick_automatically); | 106 refresh_rate, tick_automatically); |
| 103 } | 107 } |
| 104 | 108 |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 } | 298 } |
| 295 | 299 |
| 296 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { | 300 TEST_F(RenderWidgetCompositorOutputSurfaceTest, FallbackSuccessNormalSuccess) { |
| 297 // The first success is a fallback, but the next should not be a fallback. | 301 // The first success is a fallback, but the next should not be a fallback. |
| 298 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, | 302 RunTest(false, RenderWidgetCompositor::OUTPUT_SURFACE_RETRIES_BEFORE_FALLBACK, |
| 299 1, 1); | 303 1, 1); |
| 300 } | 304 } |
| 301 | 305 |
| 302 } // namespace | 306 } // namespace |
| 303 } // namespace content | 307 } // namespace content |
| OLD | NEW |