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

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

Issue 2176303002: services/ui: Remove deprecated gpu code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 4 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 "services/ui/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 "services/ui/surfaces/direct_output_surface.h" 15 #include "services/ui/surfaces/direct_output_surface.h"
16 #include "services/ui/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 "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" 20 #include "services/ui/surfaces/direct_output_surface_ozone.h"
21 #endif 21 #endif
22 22
23 namespace ui { 23 namespace ui {
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,
29 const scoped_refptr<SurfacesState>& surfaces_state) 28 const scoped_refptr<SurfacesState>& surfaces_state)
30 : task_runner_(task_runner), 29 : task_runner_(task_runner),
31 surfaces_state_(surfaces_state), 30 surfaces_state_(surfaces_state),
32 factory_(surfaces_state->manager(), this), 31 factory_(surfaces_state->manager(), this),
33 allocator_(surfaces_state->next_client_id()) { 32 allocator_(surfaces_state->next_client_id()) {
34 surfaces_state_->manager()->RegisterSurfaceClientId(allocator_.client_id()); 33 surfaces_state_->manager()->RegisterSurfaceClientId(allocator_.client_id());
35 surfaces_state_->manager()->RegisterSurfaceFactoryClient( 34 surfaces_state_->manager()->RegisterSurfaceFactoryClient(
36 allocator_.client_id(), this); 35 allocator_.client_id(), this);
37 36
38 scoped_refptr<SurfacesContextProvider> surfaces_context_provider( 37 scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
39 new SurfacesContextProvider(widget, gpu_state)); 38 new SurfacesContextProvider(widget));
40 // TODO(rjkroege): If there is something better to do than CHECK, add it. 39 // TODO(rjkroege): If there is something better to do than CHECK, add it.
41 CHECK(surfaces_context_provider->BindToCurrentThread()); 40 CHECK(surfaces_context_provider->BindToCurrentThread());
42 41
43 std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source( 42 std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source(
44 new cc::DelayBasedBeginFrameSource( 43 new cc::DelayBasedBeginFrameSource(
45 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get()))); 44 base::MakeUnique<cc::DelayBasedTimeSource>(task_runner_.get())));
46 45
47 std::unique_ptr<cc::OutputSurface> display_output_surface; 46 std::unique_ptr<cc::OutputSurface> display_output_surface;
48 if (surfaces_context_provider->ContextCapabilities().surfaceless) { 47 if (surfaces_context_provider->ContextCapabilities().surfaceless) {
49 #if defined(USE_OZONE) 48 #if defined(USE_OZONE)
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 void DisplayCompositor::DisplayOutputSurfaceLost() { 115 void DisplayCompositor::DisplayOutputSurfaceLost() {
117 // 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
118 // will be submitted. 117 // will be submitted.
119 display_.reset(); 118 display_.reset();
120 } 119 }
121 120
122 void DisplayCompositor::DisplaySetMemoryPolicy( 121 void DisplayCompositor::DisplaySetMemoryPolicy(
123 const cc::ManagedMemoryPolicy& policy) {} 122 const cc::ManagedMemoryPolicy& policy) {}
124 123
125 } // namespace ui 124 } // namespace ui
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