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

Unified Diff: services/ui/ws/server_window_compositor_frame_sink_manager.h

Issue 2579693004: GpuCompositorFrameSink implements cc::mojom::DisplayPrivate (Closed)
Patch Set: Added //ipc to public_deps in color_space.typemap 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 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 a2972d6ef84be5f07049b63bed5b92024b4daec7..7bb2806ad30cd21275e6bfdbdc2d4bd7cfb28c33 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.h
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.h
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "cc/ipc/compositor_frame.mojom.h"
+#include "cc/ipc/display_compositor.mojom.h"
#include "cc/output/context_provider.h"
#include "cc/surfaces/surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
@@ -52,7 +53,9 @@ class ServerWindowCompositorFrameSinkManager {
void CreateDisplayCompositorFrameSink(
gfx::AcceleratedWidget widget,
cc::mojom::MojoCompositorFrameSinkRequest request,
- cc::mojom::MojoCompositorFrameSinkClientPtr client);
+ cc::mojom::MojoCompositorFrameSinkClientPtr client,
+ cc::mojom::DisplayPrivatePtr display_private,
Fady Samuel 2016/12/16 05:29:39 don't pass this in
Alex Z. 2016/12/16 16:42:00 Done.
+ cc::mojom::DisplayPrivateRequest display_request);
Fady Samuel 2016/12/16 05:29:39 nit: display_private_request
Alex Z. 2016/12/16 16:42:00 Done.
void CreateOffscreenCompositorFrameSink(
mojom::CompositorFrameSinkType compositor_frame_sink_type,
cc::mojom::MojoCompositorFrameSinkRequest request,
@@ -96,7 +99,8 @@ class ServerWindowCompositorFrameSinkManager {
mojom::CompositorFrameSinkType compositor_frame_sink_type,
gfx::AcceleratedWidget widget,
cc::mojom::MojoCompositorFrameSinkRequest request,
- cc::mojom::MojoCompositorFrameSinkClientPtr client);
+ cc::mojom::MojoCompositorFrameSinkClientPtr client,
+ cc::mojom::DisplayPrivateRequest display_request);
Fady Samuel 2016/12/16 05:29:39 nit: display_private_request
Alex Z. 2016/12/16 16:42:00 Done.
ServerWindow* window_;
@@ -111,6 +115,7 @@ class ServerWindowCompositorFrameSinkManager {
// least that of the window. Ideally we would wait for sizes to match, but
// the underlay is not necessarily as big as the window.
bool waiting_for_initial_frames_;
+ cc::mojom::DisplayPrivatePtr display_private_;
Fady Samuel 2016/12/16 05:29:39 Don't store this here. I think FrameGenerator shou
Alex Z. 2016/12/16 16:42:00 Done.
DISALLOW_COPY_AND_ASSIGN(ServerWindowCompositorFrameSinkManager);
};

Powered by Google App Engine
This is Rietveld 408576698