| 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/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 (*surfaces)[0].overlay_handled = true; | 57 (*surfaces)[0].overlay_handled = true; |
| 58 } | 58 } |
| 59 }; | 59 }; |
| 60 #endif // defined(USE_OZONE) | 60 #endif // defined(USE_OZONE) |
| 61 | 61 |
| 62 std::unique_ptr<BrowserCompositorOverlayCandidateValidator> | 62 std::unique_ptr<BrowserCompositorOverlayCandidateValidator> |
| 63 CreateTestValidatorOzone() { | 63 CreateTestValidatorOzone() { |
| 64 #if defined(USE_OZONE) | 64 #if defined(USE_OZONE) |
| 65 return std::unique_ptr<BrowserCompositorOverlayCandidateValidator>( | 65 return std::unique_ptr<BrowserCompositorOverlayCandidateValidator>( |
| 66 new BrowserCompositorOverlayCandidateValidatorOzone( | 66 new BrowserCompositorOverlayCandidateValidatorOzone( |
| 67 0, std::unique_ptr<ui::OverlayCandidatesOzone>( | 67 std::unique_ptr<ui::OverlayCandidatesOzone>( |
| 68 new TestOverlayCandidatesOzone()))); | 68 new TestOverlayCandidatesOzone()))); |
| 69 #else | 69 #else |
| 70 return nullptr; | 70 return nullptr; |
| 71 #endif // defined(USE_OZONE) | 71 #endif // defined(USE_OZONE) |
| 72 } | 72 } |
| 73 | 73 |
| 74 class TestOutputSurface : public BrowserCompositorOutputSurface { | 74 class TestOutputSurface : public BrowserCompositorOutputSurface { |
| 75 public: | 75 public: |
| 76 TestOutputSurface( | 76 TestOutputSurface( |
| 77 const scoped_refptr<cc::ContextProvider>& context_provider, | 77 const scoped_refptr<cc::ContextProvider>& context_provider, |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 plane_2.plane_z_order = 1; | 221 plane_2.plane_z_order = 1; |
| 222 list.push_back(plane_1); | 222 list.push_back(plane_1); |
| 223 list.push_back(plane_2); | 223 list.push_back(plane_2); |
| 224 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 224 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 225 EXPECT_FALSE(list[0].overlay_handled); | 225 EXPECT_FALSE(list[0].overlay_handled); |
| 226 } | 226 } |
| 227 #endif // defined(USE_OZONE) | 227 #endif // defined(USE_OZONE) |
| 228 | 228 |
| 229 } // namespace | 229 } // namespace |
| 230 } // namespace content | 230 } // namespace content |
| OLD | NEW |