| 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 "content/browser/compositor/reflector_impl.h" | 5 #include "content/browser/compositor/reflector_impl.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
| 13 #include "cc/output/output_surface_frame.h" | 13 #include "cc/output/output_surface_frame.h" |
| 14 #include "cc/scheduler/begin_frame_source.h" | 14 #include "cc/scheduler/begin_frame_source.h" |
| 15 #include "cc/scheduler/delay_based_time_source.h" | 15 #include "cc/scheduler/delay_based_time_source.h" |
| 16 #include "cc/test/test_context_provider.h" | 16 #include "cc/test/test_context_provider.h" |
| 17 #include "cc/test/test_web_graphics_context_3d.h" | 17 #include "cc/test/test_web_graphics_context_3d.h" |
| 18 #include "components/display_compositor/compositor_overlay_candidate_validator.h
" | 18 #include "components/viz/display_compositor/compositor_overlay_candidate_validat
or.h" |
| 19 #include "content/browser/compositor/browser_compositor_output_surface.h" | 19 #include "content/browser/compositor/browser_compositor_output_surface.h" |
| 20 #include "content/browser/compositor/reflector_texture.h" | 20 #include "content/browser/compositor/reflector_texture.h" |
| 21 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" | 21 #include "content/browser/compositor/test/no_transport_image_transport_factory.h
" |
| 22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
| 23 #include "ui/compositor/compositor.h" | 23 #include "ui/compositor/compositor.h" |
| 24 #include "ui/compositor/layer.h" | 24 #include "ui/compositor/layer.h" |
| 25 #include "ui/compositor/test/context_factories_for_test.h" | 25 #include "ui/compositor/test/context_factories_for_test.h" |
| 26 | 26 |
| 27 #if defined(USE_OZONE) | 27 #if defined(USE_OZONE) |
| 28 #include "components/display_compositor/compositor_overlay_candidate_validator_o
zone.h" | 28 #include "components/viz/display_compositor/compositor_overlay_candidate_validat
or_ozone.h" |
| 29 #include "ui/ozone/public/overlay_candidates_ozone.h" | 29 #include "ui/ozone/public/overlay_candidates_ozone.h" |
| 30 #endif // defined(USE_OZONE) | 30 #endif // defined(USE_OZONE) |
| 31 | 31 |
| 32 namespace content { | 32 namespace content { |
| 33 namespace { | 33 namespace { |
| 34 class FakeTaskRunner : public base::SingleThreadTaskRunner { | 34 class FakeTaskRunner : public base::SingleThreadTaskRunner { |
| 35 public: | 35 public: |
| 36 FakeTaskRunner() {} | 36 FakeTaskRunner() {} |
| 37 | 37 |
| 38 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, | 38 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 56 public: | 56 public: |
| 57 TestOverlayCandidatesOzone() {} | 57 TestOverlayCandidatesOzone() {} |
| 58 ~TestOverlayCandidatesOzone() override {} | 58 ~TestOverlayCandidatesOzone() override {} |
| 59 | 59 |
| 60 void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces) override { | 60 void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces) override { |
| 61 (*surfaces)[0].overlay_handled = true; | 61 (*surfaces)[0].overlay_handled = true; |
| 62 } | 62 } |
| 63 }; | 63 }; |
| 64 #endif // defined(USE_OZONE) | 64 #endif // defined(USE_OZONE) |
| 65 | 65 |
| 66 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> | 66 std::unique_ptr<viz::CompositorOverlayCandidateValidator> |
| 67 CreateTestValidatorOzone() { | 67 CreateTestValidatorOzone() { |
| 68 #if defined(USE_OZONE) | 68 #if defined(USE_OZONE) |
| 69 return std::unique_ptr< | 69 return std::unique_ptr<viz::CompositorOverlayCandidateValidator>( |
| 70 display_compositor::CompositorOverlayCandidateValidator>( | 70 new viz::CompositorOverlayCandidateValidatorOzone( |
| 71 new display_compositor::CompositorOverlayCandidateValidatorOzone( | |
| 72 std::unique_ptr<ui::OverlayCandidatesOzone>( | 71 std::unique_ptr<ui::OverlayCandidatesOzone>( |
| 73 new TestOverlayCandidatesOzone()), | 72 new TestOverlayCandidatesOzone()), |
| 74 "")); | 73 "")); |
| 75 #else | 74 #else |
| 76 return nullptr; | 75 return nullptr; |
| 77 #endif // defined(USE_OZONE) | 76 #endif // defined(USE_OZONE) |
| 78 } | 77 } |
| 79 | 78 |
| 80 class TestOutputSurface : public BrowserCompositorOutputSurface { | 79 class TestOutputSurface : public BrowserCompositorOutputSurface { |
| 81 public: | 80 public: |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 plane_2.plane_z_order = 1; | 234 plane_2.plane_z_order = 1; |
| 236 list.push_back(plane_1); | 235 list.push_back(plane_1); |
| 237 list.push_back(plane_2); | 236 list.push_back(plane_2); |
| 238 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 237 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 239 EXPECT_FALSE(list[0].overlay_handled); | 238 EXPECT_FALSE(list[0].overlay_handled); |
| 240 } | 239 } |
| 241 #endif // defined(USE_OZONE) | 240 #endif // defined(USE_OZONE) |
| 242 | 241 |
| 243 } // namespace | 242 } // namespace |
| 244 } // namespace content | 243 } // namespace content |
| OLD | NEW |