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/run_loop.h" | 5 #include "base/run_loop.h" |
6 #include "base/single_thread_task_runner.h" | 6 #include "base/single_thread_task_runner.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "cc/test/fake_output_surface_client.h" | 8 #include "cc/test/fake_output_surface_client.h" |
9 #include "cc/test/test_context_provider.h" | 9 #include "cc/test/test_context_provider.h" |
10 #include "cc/test/test_web_graphics_context_3d.h" | 10 #include "cc/test/test_web_graphics_context_3d.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 const base::Closure& task, | 33 const base::Closure& task, |
34 base::TimeDelta delay) override { | 34 base::TimeDelta delay) override { |
35 return true; | 35 return true; |
36 } | 36 } |
37 bool PostDelayedTask(const tracked_objects::Location& from_here, | 37 bool PostDelayedTask(const tracked_objects::Location& from_here, |
38 const base::Closure& task, | 38 const base::Closure& task, |
39 base::TimeDelta delay) override { | 39 base::TimeDelta delay) override { |
40 return true; | 40 return true; |
41 } | 41 } |
42 bool RunsTasksOnCurrentThread() const override { return true; } | 42 bool RunsTasksOnCurrentThread() const override { return true; } |
| 43 std::string GetThreadName() const override { return std::string(); } |
43 | 44 |
44 protected: | 45 protected: |
45 ~FakeTaskRunner() override {} | 46 ~FakeTaskRunner() override {} |
46 }; | 47 }; |
47 | 48 |
48 #if defined(USE_OZONE) | 49 #if defined(USE_OZONE) |
49 class TestOverlayCandidatesOzone : public ui::OverlayCandidatesOzone { | 50 class TestOverlayCandidatesOzone : public ui::OverlayCandidatesOzone { |
50 public: | 51 public: |
51 TestOverlayCandidatesOzone() {} | 52 TestOverlayCandidatesOzone() {} |
52 ~TestOverlayCandidatesOzone() override {} | 53 ~TestOverlayCandidatesOzone() override {} |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 plane_2.plane_z_order = 1; | 224 plane_2.plane_z_order = 1; |
224 list.push_back(plane_1); | 225 list.push_back(plane_1); |
225 list.push_back(plane_2); | 226 list.push_back(plane_2); |
226 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 227 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
227 EXPECT_FALSE(list[0].overlay_handled); | 228 EXPECT_FALSE(list[0].overlay_handled); |
228 } | 229 } |
229 #endif // defined(USE_OZONE) | 230 #endif // defined(USE_OZONE) |
230 | 231 |
231 } // namespace | 232 } // namespace |
232 } // namespace content | 233 } // namespace content |
OLD | NEW |