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

Unified Diff: services/ui/surfaces/mus_gpu_memory_buffer_manager.h

Issue 2481263002: Introduce Display Compositor mojo interface. Use InProcessContextProvider. (Closed)
Patch Set: Speculative fix for android build issue Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: services/ui/surfaces/mus_gpu_memory_buffer_manager.h
diff --git a/services/ui/ws/mus_gpu_memory_buffer_manager.h b/services/ui/surfaces/mus_gpu_memory_buffer_manager.h
similarity index 80%
rename from services/ui/ws/mus_gpu_memory_buffer_manager.h
rename to services/ui/surfaces/mus_gpu_memory_buffer_manager.h
index a40a7438d1335deb2e84ae31e4629dc0f4df1b12..59fd05d03b32d105dc69dd974864b9cea952a292 100644
--- a/services/ui/ws/mus_gpu_memory_buffer_manager.h
+++ b/services/ui/surfaces/mus_gpu_memory_buffer_manager.h
@@ -2,28 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
-#define SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#ifndef SERVICES_UI_SURFACES_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#define SERVICES_UI_SURFACES_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
#include <memory>
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
+#include "services/ui/gpu/interfaces/gpu_service_internal.mojom.h"
namespace ui {
-namespace mojom {
-class GpuServiceInternal;
-}
-
-namespace ws {
-
// This GpuMemoryBufferManager is for establishing a GpuChannelHost used by
// mus locally.
class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
public:
- MusGpuMemoryBufferManager(mojom::GpuServiceInternal* gpu_service,
+ MusGpuMemoryBufferManager(mojom::GpuServiceInternalPtr gpu_service,
int client_id);
~MusGpuMemoryBufferManager() override;
@@ -48,12 +43,11 @@ class MusGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
bool is_native,
const gpu::SyncToken& sync_token);
- mojom::GpuServiceInternal* gpu_service_;
+ mojom::GpuServiceInternalPtr gpu_service_;
const int client_id_;
base::WeakPtrFactory<MusGpuMemoryBufferManager> weak_factory_;
};
-} // namespace ws
} // namespace ui
-#endif // SERVICES_UI_WS_MUS_GPU_MEMORY_BUFFER_MANAGER_H_
+#endif // SERVICES_UI_SURFACES_MUS_GPU_MEMORY_BUFFER_MANAGER_H_

Powered by Google App Engine
This is Rietveld 408576698