| 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 "base/memory/ptr_util.h" | 5 #include "base/memory/ptr_util.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "cc/output/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
| 10 #include "cc/scheduler/begin_frame_source.h" | 10 #include "cc/scheduler/begin_frame_source.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 }; | 61 }; |
| 62 #endif // defined(USE_OZONE) | 62 #endif // defined(USE_OZONE) |
| 63 | 63 |
| 64 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> | 64 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
| 65 CreateTestValidatorOzone() { | 65 CreateTestValidatorOzone() { |
| 66 #if defined(USE_OZONE) | 66 #if defined(USE_OZONE) |
| 67 return std::unique_ptr< | 67 return std::unique_ptr< |
| 68 display_compositor::CompositorOverlayCandidateValidator>( | 68 display_compositor::CompositorOverlayCandidateValidator>( |
| 69 new display_compositor::CompositorOverlayCandidateValidatorOzone( | 69 new display_compositor::CompositorOverlayCandidateValidatorOzone( |
| 70 std::unique_ptr<ui::OverlayCandidatesOzone>( | 70 std::unique_ptr<ui::OverlayCandidatesOzone>( |
| 71 new TestOverlayCandidatesOzone()))); | 71 new TestOverlayCandidatesOzone()), |
| 72 false)); |
| 72 #else | 73 #else |
| 73 return nullptr; | 74 return nullptr; |
| 74 #endif // defined(USE_OZONE) | 75 #endif // defined(USE_OZONE) |
| 75 } | 76 } |
| 76 | 77 |
| 77 class TestOutputSurface : public BrowserCompositorOutputSurface { | 78 class TestOutputSurface : public BrowserCompositorOutputSurface { |
| 78 public: | 79 public: |
| 79 TestOutputSurface(scoped_refptr<cc::ContextProvider> context_provider, | 80 TestOutputSurface(scoped_refptr<cc::ContextProvider> context_provider, |
| 80 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, | 81 scoped_refptr<ui::CompositorVSyncManager> vsync_manager, |
| 81 cc::SyntheticBeginFrameSource* begin_frame_source) | 82 cc::SyntheticBeginFrameSource* begin_frame_source) |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 plane_2.plane_z_order = 1; | 226 plane_2.plane_z_order = 1; |
| 226 list.push_back(plane_1); | 227 list.push_back(plane_1); |
| 227 list.push_back(plane_2); | 228 list.push_back(plane_2); |
| 228 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 229 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 229 EXPECT_FALSE(list[0].overlay_handled); | 230 EXPECT_FALSE(list[0].overlay_handled); |
| 230 } | 231 } |
| 231 #endif // defined(USE_OZONE) | 232 #endif // defined(USE_OZONE) |
| 232 | 233 |
| 233 } // namespace | 234 } // namespace |
| 234 } // namespace content | 235 } // namespace content |
| OLD | NEW |