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

Unified Diff: services/ui/ws/server_window_compositor_frame_sink_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/ws/server_window_compositor_frame_sink_manager.h
diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.h b/services/ui/ws/server_window_compositor_frame_sink_manager.h
index 746767d18e8bf6d30970dd8a5c4fab105d08f5ce..d2db13e068e228009f5dd5decfe81554aa421c7f 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.h
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.h
@@ -13,7 +13,6 @@
#include "cc/surfaces/surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/ui/surfaces/surfaces_context_provider.h"
namespace gpu {
class GpuMemoryBufferManager;
@@ -22,7 +21,6 @@ class GpuMemoryBufferManager;
namespace ui {
namespace ws {
-class GpuCompositorFrameSink;
class ServerWindow;
class ServerWindowCompositorFrameSink;
class ServerWindowCompositorFrameSinkManagerTestApi;
@@ -39,7 +37,6 @@ struct CompositorFrameSinkData {
cc::mojom::MojoCompositorFrameSinkPrivatePtr compositor_frame_sink;
cc::mojom::MojoCompositorFrameSinkPrivateRequest
pending_compositor_frame_sink_request;
- std::unique_ptr<GpuCompositorFrameSink> compositor_frame_sink_impl_;
};
// ServerWindowCompositorFrameSinkManager tracks the surfaces associated with a
@@ -59,8 +56,6 @@ class ServerWindowCompositorFrameSinkManager {
void CreateCompositorFrameSink(
mojom::CompositorFrameSinkType compositor_frame_sink_type,
gfx::AcceleratedWidget widget,
- gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
- scoped_refptr<SurfacesContextProvider> context_provider,
cc::mojom::MojoCompositorFrameSinkRequest request,
cc::mojom::MojoCompositorFrameSinkClientPtr client);

Powered by Google App Engine
This is Rietveld 408576698