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

Side by Side Diff: services/ui/surfaces/display_compositor.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/mus/surfaces/display_compositor.h" 5 #include "services/ui/surfaces/display_compositor.h"
6 6
7 #include "cc/output/copy_output_request.h" 7 #include "cc/output/copy_output_request.h"
8 #include "cc/output/output_surface.h" 8 #include "cc/output/output_surface.h"
9 #include "cc/output/renderer_settings.h" 9 #include "cc/output/renderer_settings.h"
10 #include "cc/output/texture_mailbox_deleter.h" 10 #include "cc/output/texture_mailbox_deleter.h"
11 #include "cc/scheduler/begin_frame_source.h" 11 #include "cc/scheduler/begin_frame_source.h"
12 #include "cc/scheduler/delay_based_time_source.h" 12 #include "cc/scheduler/delay_based_time_source.h"
13 #include "cc/surfaces/display.h" 13 #include "cc/surfaces/display.h"
14 #include "cc/surfaces/display_scheduler.h" 14 #include "cc/surfaces/display_scheduler.h"
15 #include "components/mus/surfaces/direct_output_surface.h" 15 #include "services/ui/surfaces/direct_output_surface.h"
16 #include "components/mus/surfaces/surfaces_context_provider.h" 16 #include "services/ui/surfaces/surfaces_context_provider.h"
17 17
18 #if defined(USE_OZONE) 18 #if defined(USE_OZONE)
19 #include "components/mus/surfaces/direct_output_surface_ozone.h"
20 #include "gpu/command_buffer/client/gles2_interface.h" 19 #include "gpu/command_buffer/client/gles2_interface.h"
20 #include "services/ui/surfaces/direct_output_surface_ozone.h"
21 #endif 21 #endif
22 22
23 namespace mus { 23 namespace mus {
24 24
25 DisplayCompositor::DisplayCompositor( 25 DisplayCompositor::DisplayCompositor(
26 scoped_refptr<base::SingleThreadTaskRunner> task_runner, 26 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
27 gfx::AcceleratedWidget widget, 27 gfx::AcceleratedWidget widget,
28 const scoped_refptr<GpuState>& gpu_state, 28 const scoped_refptr<GpuState>& gpu_state,
29 const scoped_refptr<SurfacesState>& surfaces_state) 29 const scoped_refptr<SurfacesState>& surfaces_state)
30 : task_runner_(task_runner), 30 : task_runner_(task_runner),
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void DisplayCompositor::DisplayOutputSurfaceLost() { 115 void DisplayCompositor::DisplayOutputSurfaceLost() {
116 // TODO(fsamuel): This looks like it would crash if a frame was in flight and 116 // TODO(fsamuel): This looks like it would crash if a frame was in flight and
117 // will be submitted. 117 // will be submitted.
118 display_.reset(); 118 display_.reset();
119 } 119 }
120 120
121 void DisplayCompositor::DisplaySetMemoryPolicy( 121 void DisplayCompositor::DisplaySetMemoryPolicy(
122 const cc::ManagedMemoryPolicy& policy) {} 122 const cc::ManagedMemoryPolicy& policy) {}
123 123
124 } // namespace mus 124 } // namespace mus
OLDNEW
« no previous file with comments | « services/ui/surfaces/display_compositor.h ('k') | services/ui/surfaces/ozone_gpu_memory_buffer_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698