Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ | 5 #ifndef COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ |
| 6 #define COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ | 6 #define COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ |
| 7 | 7 |
| 8 #include "cc/ipc/compositor_frame.mojom.h" | 8 #include "cc/ipc/compositor_frame.mojom.h" |
| 9 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h" | 9 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h" |
| 10 #include "cc/resources/transferable_resource.h" | 10 #include "cc/resources/transferable_resource.h" |
| 11 #include "cc/surfaces/compositor_frame_sink_support.h" | 11 #include "cc/surfaces/compositor_frame_sink_support.h" |
| 12 #include "cc/surfaces/compositor_frame_sink_support_client.h" | 12 #include "cc/surfaces/compositor_frame_sink_support_client.h" |
| 13 #include "mojo/public/cpp/bindings/strong_binding.h" | 13 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 14 | 14 |
| 15 namespace exo { | 15 namespace exo { |
| 16 | 16 |
| 17 class CompositorFrameSinkHolder; | |
| 18 | |
| 17 class CompositorFrameSink : public cc::CompositorFrameSinkSupportClient, | 19 class CompositorFrameSink : public cc::CompositorFrameSinkSupportClient, |
| 18 public cc::mojom::MojoCompositorFrameSink { | 20 public cc::mojom::MojoCompositorFrameSink { |
| 19 public: | 21 public: |
| 20 CompositorFrameSink(const cc::FrameSinkId& frame_sink_id, | 22 CompositorFrameSink(const cc::FrameSinkId& frame_sink_id, |
| 21 cc::SurfaceManager* surface_manager, | 23 cc::SurfaceManager* surface_manager, |
| 22 cc::mojom::MojoCompositorFrameSinkClientPtr client); | 24 CompositorFrameSinkHolder* client); |
| 23 | 25 |
| 24 ~CompositorFrameSink() override; | 26 ~CompositorFrameSink() override; |
| 25 | 27 |
| 26 // Overridden from cc::mojom::MojoCompositorFrameSink: | 28 // Overridden from cc::mojom::MojoCompositorFrameSink: |
| 27 void SetNeedsBeginFrame(bool needs_begin_frame) override; | 29 void SetNeedsBeginFrame(bool needs_begin_frame) override; |
| 28 void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id, | 30 void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id, |
| 29 cc::CompositorFrame frame) override; | 31 cc::CompositorFrame frame) override; |
| 30 void AddSurfaceReferences( | 32 void AddSurfaceReferences( |
| 31 const std::vector<cc::SurfaceReference>& references) override; | 33 const std::vector<cc::SurfaceReference>& references) override; |
| 32 void RemoveSurfaceReferences( | 34 void RemoveSurfaceReferences( |
| 33 const std::vector<cc::SurfaceReference>& references) override; | 35 const std::vector<cc::SurfaceReference>& references) override; |
| 34 void EvictFrame() override; | 36 void EvictFrame() override; |
| 35 void Require(const cc::LocalFrameId& local_frame_id, | 37 void Require(const cc::LocalFrameId& local_frame_id, |
| 36 const cc::SurfaceSequence& sequence) override; | 38 const cc::SurfaceSequence& sequence) override; |
| 37 void Satisfy(const cc::SurfaceSequence& sequence) override; | 39 void Satisfy(const cc::SurfaceSequence& sequence) override; |
| 38 | 40 |
| 39 // Overridden from cc::CompositorFrameSinkSupportClient: | 41 // Overridden from cc::CompositorFrameSinkSupportClient: |
| 40 void DidReceiveCompositorFrameAck() override; | 42 void DidReceiveCompositorFrameAck() override; |
| 41 void OnBeginFrame(const cc::BeginFrameArgs& args) override; | 43 void OnBeginFrame(const cc::BeginFrameArgs& args) override; |
| 42 void ReclaimResources(const cc::ReturnedResourceArray& resources) override; | 44 void ReclaimResources(const cc::ReturnedResourceArray& resources) override; |
| 43 void WillDrawSurface() override; | 45 void WillDrawSurface() override; |
| 44 | 46 |
| 45 private: | 47 private: |
| 46 cc::CompositorFrameSinkSupport support_; | 48 cc::CompositorFrameSinkSupport support_; |
| 47 cc::mojom::MojoCompositorFrameSinkClientPtr client_; | 49 CompositorFrameSinkHolder* client_; |
| 48 cc::ReturnedResourceArray surface_returned_resources_; | 50 cc::ReturnedResourceArray surface_returned_resources_; |
| 49 mojo::StrongBindingPtr<cc::mojom::MojoCompositorFrameSink> binding_; | 51 mojo::StrongBindingPtr<cc::mojom::MojoCompositorFrameSink> binding_; |
|
Fady Samuel
2017/01/13 19:14:28
Try restoring the existing code and making this bi
| |
| 50 | 52 |
| 51 DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink); | 53 DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink); |
| 52 }; | 54 }; |
| 53 | 55 |
| 54 } // namespace exo | 56 } // namespace exo |
| 55 | 57 |
| 56 #endif // COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ | 58 #endif // COMPONENTS_EXO_EXO_COMPOSITOR_FRAME_SINK_H_ |
| OLD | NEW |