Index: components/display_compositor/gpu_compositor_frame_sink.h |
diff --git a/components/display_compositor/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h |
index 0b1acb9e3bf56a1891681ae8f9101f8040b14c20..286e47964c4de8360617275911747652b973c735 100644 |
--- a/components/display_compositor/gpu_compositor_frame_sink.h |
+++ b/components/display_compositor/gpu_compositor_frame_sink.h |
@@ -23,13 +23,11 @@ namespace display_compositor { |
// Server side representation of a WindowSurface. |
class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink |
: public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient), |
- public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink), |
- public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSinkPrivate) { |
+ public NON_EXPORTED_BASE(cc::mojom::MojoCompositorFrameSink) { |
public: |
GpuCompositorFrameSink( |
GpuCompositorFrameSinkDelegate* delegate, |
std::unique_ptr<cc::CompositorFrameSinkSupport>, |
- cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request, |
cc::mojom::MojoCompositorFrameSinkClientPtr client); |
~GpuCompositorFrameSink() override; |
@@ -43,14 +41,16 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink |
const cc::SurfaceSequence& sequence) override; |
void Satisfy(const cc::SurfaceSequence& sequence) override; |
- // cc::mojom::MojoCompositorFrameSinkPrivate: |
- void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override; |
- void RemoveChildFrameSink( |
- const cc::FrameSinkId& child_frame_sink_id) override; |
- |
protected: |
void OnClientConnectionLost(); |
- void OnPrivateConnectionLost(); |
+ void SetClientConnectionLost(bool client_connection_lost) { |
+ client_connection_lost_ = client_connection_lost; |
+ } |
+ bool GetClientConnectionLost() { return client_connection_lost_; } |
+ void SetPrivateConnectionLost(bool private_connection_lost) { |
+ private_connection_lost_ = private_connection_lost; |
+ } |
+ bool GetPrivateConnectionLost() { return private_connection_lost_; } |
GpuCompositorFrameSinkDelegate* const delegate_; |
std::unique_ptr<cc::CompositorFrameSinkSupport> support_; |
@@ -63,11 +63,9 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink |
void WillDrawSurface() override; |
bool client_connection_lost_ = false; |
- bool private_connection_lost_ = false; |
+ bool private_connection_lost_ = true; |
cc::mojom::MojoCompositorFrameSinkClientPtr client_; |
- mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate> |
- compositor_frame_sink_private_binding_; |
DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink); |
}; |