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

Side by Side Diff: services/ui/gpu/gpu_main.cc

Issue 2562623005: mus/gpu: Rename the client/server side memory buffer managers. (Closed)
Patch Set: tot merge Created 4 years 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/gpu/gpu_main.h" 5 #include "services/ui/gpu/gpu_main.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "gpu/ipc/common/gpu_memory_buffer_support.h" 9 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
10 #include "gpu/ipc/gpu_in_process_thread_service.h" 10 #include "gpu/ipc/gpu_in_process_thread_service.h"
11 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" 11 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
12 #include "gpu/ipc/service/gpu_watchdog_thread.h" 12 #include "gpu/ipc/service/gpu_watchdog_thread.h"
13 #include "services/ui/common/mus_gpu_memory_buffer_manager.h" 13 #include "services/ui/common/server_gpu_memory_buffer_manager.h"
14 #include "services/ui/gpu/gpu_service_internal.h" 14 #include "services/ui/gpu/gpu_service_internal.h"
15 15
16 namespace { 16 namespace {
17 17
18 #if defined(OS_WIN) 18 #if defined(OS_WIN)
19 std::unique_ptr<base::MessagePump> CreateMessagePumpWin() { 19 std::unique_ptr<base::MessagePump> CreateMessagePumpWin() {
20 base::MessagePumpForGpu::InitFactory(); 20 base::MessagePumpForGpu::InitFactory();
21 return base::MessageLoop::CreateMessagePumpForType( 21 return base::MessageLoop::CreateMessagePumpForType(
22 base::MessageLoop::TYPE_UI); 22 base::MessageLoop::TYPE_UI);
23 } 23 }
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 mojom::GpuServiceInternalPtrInfo gpu_service_info, 195 mojom::GpuServiceInternalPtrInfo gpu_service_info,
196 cc::mojom::DisplayCompositorRequest request, 196 cc::mojom::DisplayCompositorRequest request,
197 cc::mojom::DisplayCompositorClientPtrInfo client_info) { 197 cc::mojom::DisplayCompositorClientPtrInfo client_info) {
198 DCHECK(!display_compositor_); 198 DCHECK(!display_compositor_);
199 cc::mojom::DisplayCompositorClientPtr client; 199 cc::mojom::DisplayCompositorClientPtr client;
200 client.Bind(std::move(client_info)); 200 client.Bind(std::move(client_info));
201 201
202 gpu_internal_.Bind(std::move(gpu_service_info)); 202 gpu_internal_.Bind(std::move(gpu_service_info));
203 203
204 display_compositor_ = base::MakeUnique<DisplayCompositor>( 204 display_compositor_ = base::MakeUnique<DisplayCompositor>(
205 gpu_command_service_, base::MakeUnique<MusGpuMemoryBufferManager>( 205 gpu_command_service_, base::MakeUnique<ServerGpuMemoryBufferManager>(
206 gpu_internal_.get(), 1 /* client_id */), 206 gpu_internal_.get(), 1 /* client_id */),
207 image_factory, std::move(request), std::move(client)); 207 image_factory, std::move(request), std::move(client));
208 } 208 }
209 209
210 void GpuMain::TearDownOnCompositorThread() { 210 void GpuMain::TearDownOnCompositorThread() {
211 display_compositor_.reset(); 211 display_compositor_.reset();
212 gpu_internal_.reset(); 212 gpu_internal_.reset();
213 } 213 }
214 214
215 void GpuMain::TearDownOnGpuThread() { 215 void GpuMain::TearDownOnGpuThread() {
(...skipping 26 matching lines...) Expand all
242 // TODO(sad): https://crbug.com/645602 242 // TODO(sad): https://crbug.com/645602
243 } 243 }
244 244
245 bool GpuMain::EnsureSandboxInitialized( 245 bool GpuMain::EnsureSandboxInitialized(
246 gpu::GpuWatchdogThread* watchdog_thread) { 246 gpu::GpuWatchdogThread* watchdog_thread) {
247 // TODO(sad): https://crbug.com/645602 247 // TODO(sad): https://crbug.com/645602
248 return true; 248 return true;
249 } 249 }
250 250
251 } // namespace ui 251 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/common/server_gpu_memory_buffer_manager.cc ('k') | services/ui/public/cpp/gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698