Index: ui/aura/mus/window_compositor_frame_sink.h |
diff --git a/ui/aura/mus/window_compositor_frame_sink.h b/ui/aura/mus/window_compositor_frame_sink.h |
index 5ac53a3fbf0d8b7c707d6865d30a23ec32f9e02d..e0a4f245ae154055394da8951320df77e6c6f3c4 100644 |
--- a/ui/aura/mus/window_compositor_frame_sink.h |
+++ b/ui/aura/mus/window_compositor_frame_sink.h |
@@ -10,6 +10,7 @@ |
#include "cc/output/compositor_frame_sink.h" |
#include "cc/scheduler/begin_frame_source.h" |
#include "cc/surfaces/surface_id.h" |
+#include "cc/surfaces/surface_id_allocator.h" |
#include "mojo/public/cpp/bindings/binding.h" |
namespace aura { |
@@ -39,8 +40,7 @@ class WindowCompositorFrameSink |
WindowCompositorFrameSink( |
scoped_refptr<cc::ContextProvider> context_provider, |
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
- mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSink> |
- compositor_frame_sink_info, |
+ cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info, |
cc::mojom::MojoCompositorFrameSinkClientRequest client_request); |
// cc::mojom::MojoCompositorFrameSinkClient implementation: |
@@ -51,11 +51,12 @@ class WindowCompositorFrameSink |
// cc::ExternalBeginFrameSourceClient implementation. |
void OnNeedsBeginFrames(bool needs_begin_frames) override; |
+ gfx::Size last_submitted_frame_size_; |
+ cc::LocalFrameId local_frame_id_; |
+ cc::SurfaceIdAllocator id_allocator_; |
std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_; |
- mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSink> |
- compositor_frame_sink_info_; |
- mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSinkClient> |
- client_request_; |
+ cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info_; |
+ cc::mojom::MojoCompositorFrameSinkClientRequest client_request_; |
cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_; |
std::unique_ptr<mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient>> |
client_binding_; |