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

Side by Side Diff: services/ui/gpu/gpu_service.h

Issue 2627993002: mus-gpu: Include GpuPreferences when requesting for GpuService. (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « services/ui/gpu/gpu_main.cc ('k') | services/ui/gpu/gpu_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef SERVICES_UI_GPU_GPU_SERVICE_H_ 5 #ifndef SERVICES_UI_GPU_GPU_SERVICE_H_
6 #define SERVICES_UI_GPU_GPU_SERVICE_H_ 6 #define SERVICES_UI_GPU_GPU_SERVICE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/threading/non_thread_safe.h" 10 #include "base/threading/non_thread_safe.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 13 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
14 #include "gpu/command_buffer/service/gpu_preferences.h" 14 #include "gpu/command_buffer/service/gpu_preferences.h"
15 #include "gpu/config/gpu_info.h" 15 #include "gpu/config/gpu_info.h"
16 #include "gpu/ipc/common/surface_handle.h" 16 #include "gpu/ipc/common/surface_handle.h"
17 #include "gpu/ipc/service/gpu_channel.h" 17 #include "gpu/ipc/service/gpu_channel.h"
18 #include "gpu/ipc/service/gpu_channel_manager.h" 18 #include "gpu/ipc/service/gpu_channel_manager.h"
19 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" 19 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
20 #include "gpu/ipc/service/gpu_config.h" 20 #include "gpu/ipc/service/gpu_config.h"
21 #include "gpu/ipc/service/x_util.h" 21 #include "gpu/ipc/service/x_util.h"
22 #include "mojo/public/cpp/bindings/binding.h"
23 #include "mojo/public/cpp/bindings/binding_set.h" 22 #include "mojo/public/cpp/bindings/binding_set.h"
24 #include "services/ui/gpu/interfaces/gpu_host.mojom.h" 23 #include "services/ui/gpu/interfaces/gpu_host.mojom.h"
25 #include "services/ui/gpu/interfaces/gpu_service.mojom.h" 24 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
26 #include "ui/gfx/native_widget_types.h" 25 #include "ui/gfx/native_widget_types.h"
27 26
28 namespace gpu { 27 namespace gpu {
29 class GpuMemoryBufferFactory; 28 class GpuMemoryBufferFactory;
30 class GpuWatchdogThread; 29 class GpuWatchdogThread;
31 class SyncPointManager; 30 class SyncPointManager;
32 } 31 }
(...skipping 13 matching lines...) Expand all
46 public mojom::GpuService, 45 public mojom::GpuService,
47 public base::NonThreadSafe { 46 public base::NonThreadSafe {
48 public: 47 public:
49 GpuService(const gpu::GPUInfo& gpu_info, 48 GpuService(const gpu::GPUInfo& gpu_info,
50 std::unique_ptr<gpu::GpuWatchdogThread> watchdog, 49 std::unique_ptr<gpu::GpuWatchdogThread> watchdog,
51 gpu::GpuMemoryBufferFactory* memory_buffer_factory, 50 gpu::GpuMemoryBufferFactory* memory_buffer_factory,
52 scoped_refptr<base::SingleThreadTaskRunner> io_runner); 51 scoped_refptr<base::SingleThreadTaskRunner> io_runner);
53 52
54 ~GpuService() override; 53 ~GpuService() override;
55 54
56 void InitializeWithHost(mojom::GpuHostPtr gpu_host); 55 void InitializeWithHost(mojom::GpuHostPtr gpu_host,
56 const gpu::GpuPreferences& preferences);
57 void Bind(mojom::GpuServiceRequest request); 57 void Bind(mojom::GpuServiceRequest request);
58 58
59 media::MediaGpuChannelManager* media_gpu_channel_manager() {
60 return media_gpu_channel_manager_.get();
61 }
62
63 gpu::GpuChannelManager* gpu_channel_manager() {
64 return gpu_channel_manager_.get();
65 }
66
59 private: 67 private:
60 friend class GpuMain; 68 friend class GpuMain;
61 69
62 gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle( 70 gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferFromeHandle(
63 gfx::GpuMemoryBufferHandle buffer_handle, 71 gfx::GpuMemoryBufferHandle buffer_handle,
64 gfx::GpuMemoryBufferId id, 72 gfx::GpuMemoryBufferId id,
65 const gfx::Size& size, 73 const gfx::Size& size,
66 gfx::BufferFormat format, 74 gfx::BufferFormat format,
67 int client_id); 75 int client_id);
68 76
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_; 142 std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
135 std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_; 143 std::unique_ptr<media::MediaGpuChannelManager> media_gpu_channel_manager_;
136 mojo::BindingSet<mojom::GpuService> bindings_; 144 mojo::BindingSet<mojom::GpuService> bindings_;
137 145
138 DISALLOW_COPY_AND_ASSIGN(GpuService); 146 DISALLOW_COPY_AND_ASSIGN(GpuService);
139 }; 147 };
140 148
141 } // namespace ui 149 } // namespace ui
142 150
143 #endif // SERVICES_UI_GPU_GPU_SERVICE_H_ 151 #endif // SERVICES_UI_GPU_GPU_SERVICE_H_
OLDNEW
« no previous file with comments | « services/ui/gpu/gpu_main.cc ('k') | services/ui/gpu/gpu_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698