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

Side by Side Diff: services/ui/common/server_gpu_memory_buffer_manager.h

Issue 2649553003: gpu: merge gpu/ipc/host/gpu_memory_buffer_support.cc to gpu/ipc/common/
Patch Set: fix bot failure 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
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_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ 5 #ifndef SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_
6 #define SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ 6 #define SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/threading/thread_checker.h" 12 #include "base/threading/thread_checker.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/ipc/host/gpu_memory_buffer_support.h" 14 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
15 #include "services/ui/gpu/interfaces/gpu_service.mojom.h" 15 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
16 16
17 namespace ui { 17 namespace ui {
18 18
19 // This GpuMemoryBufferManager is for establishing a GpuChannelHost used by 19 // This GpuMemoryBufferManager is for establishing a GpuChannelHost used by
20 // mus locally. 20 // mus locally.
21 class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager, 21 class ServerGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager,
22 public base::ThreadChecker { 22 public base::ThreadChecker {
23 public: 23 public:
24 ServerGpuMemoryBufferManager(mojom::GpuService* gpu_service, int client_id); 24 ServerGpuMemoryBufferManager(mojom::GpuService* gpu_service, int client_id);
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 const gpu::GpuMemoryBufferConfigurationSet native_configurations_; 60 const gpu::GpuMemoryBufferConfigurationSet native_configurations_;
61 base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_; 61 base::WeakPtrFactory<ServerGpuMemoryBufferManager> weak_factory_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager); 63 DISALLOW_COPY_AND_ASSIGN(ServerGpuMemoryBufferManager);
64 }; 64 };
65 65
66 } // namespace ui 66 } // namespace ui
67 67
68 #endif // SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_ 68 #endif // SERVICES_UI_COMMON_SERVER_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« gpu/ipc/common/gpu_memory_buffer_support.cc ('K') | « services/ui/common/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698