Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Side by Side Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 2873243002: Move components/display_compositor to components/viz/display_compositor (Closed)
Patch Set: Rebase and fix mac build Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "cc/output/output_surface_frame.h" 12 #include "cc/output/output_surface_frame.h"
13 #include "cc/scheduler/begin_frame_source.h" 13 #include "cc/scheduler/begin_frame_source.h"
14 #include "cc/scheduler/delay_based_time_source.h" 14 #include "cc/scheduler/delay_based_time_source.h"
15 #include "cc/test/test_context_provider.h" 15 #include "cc/test/test_context_provider.h"
16 #include "cc/test/test_web_graphics_context_3d.h" 16 #include "cc/test/test_web_graphics_context_3d.h"
17 #include "components/display_compositor/compositor_overlay_candidate_validator.h " 17 #include "components/viz/display_compositor/compositor_overlay_candidate_validat or.h"
18 #include "content/browser/compositor/browser_compositor_output_surface.h" 18 #include "content/browser/compositor/browser_compositor_output_surface.h"
19 #include "content/browser/compositor/reflector_texture.h" 19 #include "content/browser/compositor/reflector_texture.h"
20 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 20 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "ui/compositor/compositor.h" 22 #include "ui/compositor/compositor.h"
23 #include "ui/compositor/layer.h" 23 #include "ui/compositor/layer.h"
24 #include "ui/compositor/test/context_factories_for_test.h" 24 #include "ui/compositor/test/context_factories_for_test.h"
25 25
26 #if defined(USE_OZONE) 26 #if defined(USE_OZONE)
27 #include "components/display_compositor/compositor_overlay_candidate_validator_o zone.h" 27 #include "components/viz/display_compositor/compositor_overlay_candidate_validat or_ozone.h"
28 #include "ui/ozone/public/overlay_candidates_ozone.h" 28 #include "ui/ozone/public/overlay_candidates_ozone.h"
29 #endif // defined(USE_OZONE) 29 #endif // defined(USE_OZONE)
30 30
31 namespace content { 31 namespace content {
32 namespace { 32 namespace {
33 class FakeTaskRunner : public base::SingleThreadTaskRunner { 33 class FakeTaskRunner : public base::SingleThreadTaskRunner {
34 public: 34 public:
35 FakeTaskRunner() {} 35 FakeTaskRunner() {}
36 36
37 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, 37 bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
(...skipping 17 matching lines...) Expand all
55 public: 55 public:
56 TestOverlayCandidatesOzone() {} 56 TestOverlayCandidatesOzone() {}
57 ~TestOverlayCandidatesOzone() override {} 57 ~TestOverlayCandidatesOzone() override {}
58 58
59 void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces) override { 59 void CheckOverlaySupport(OverlaySurfaceCandidateList* surfaces) override {
60 (*surfaces)[0].overlay_handled = true; 60 (*surfaces)[0].overlay_handled = true;
61 } 61 }
62 }; 62 };
63 #endif // defined(USE_OZONE) 63 #endif // defined(USE_OZONE)
64 64
65 std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> 65 std::unique_ptr<viz::CompositorOverlayCandidateValidator>
66 CreateTestValidatorOzone() { 66 CreateTestValidatorOzone() {
67 #if defined(USE_OZONE) 67 #if defined(USE_OZONE)
68 return std::unique_ptr< 68 return std::unique_ptr<viz::CompositorOverlayCandidateValidator>(
69 display_compositor::CompositorOverlayCandidateValidator>( 69 new viz::CompositorOverlayCandidateValidatorOzone(
70 new display_compositor::CompositorOverlayCandidateValidatorOzone(
71 std::unique_ptr<ui::OverlayCandidatesOzone>( 70 std::unique_ptr<ui::OverlayCandidatesOzone>(
72 new TestOverlayCandidatesOzone()), 71 new TestOverlayCandidatesOzone()),
73 "")); 72 ""));
74 #else 73 #else
75 return nullptr; 74 return nullptr;
76 #endif // defined(USE_OZONE) 75 #endif // defined(USE_OZONE)
77 } 76 }
78 77
79 class TestOutputSurface : public BrowserCompositorOutputSurface { 78 class TestOutputSurface : public BrowserCompositorOutputSurface {
80 public: 79 public:
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 plane_2.plane_z_order = 1; 233 plane_2.plane_z_order = 1;
235 list.push_back(plane_1); 234 list.push_back(plane_1);
236 list.push_back(plane_2); 235 list.push_back(plane_2);
237 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); 236 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list);
238 EXPECT_FALSE(list[0].overlay_handled); 237 EXPECT_FALSE(list[0].overlay_handled);
239 } 238 }
240 #endif // defined(USE_OZONE) 239 #endif // defined(USE_OZONE)
241 240
242 } // namespace 241 } // namespace
243 } // namespace content 242 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698