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

Side by Side Diff: services/ui/surfaces/gpu_compositor_frame_sink.h

Issue 2579693004: GpuCompositorFrameSink implements cc::mojom::DisplayPrivate (Closed)
Patch Set: Addresed comments 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_ 5 #ifndef SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
6 #define SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_ 6 #define SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "cc/ipc/display_compositor.mojom.h"
13 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h" 14 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
14 #include "cc/surfaces/compositor_frame_sink_support.h" 15 #include "cc/surfaces/compositor_frame_sink_support.h"
15 #include "cc/surfaces/compositor_frame_sink_support_client.h" 16 #include "cc/surfaces/compositor_frame_sink_support_client.h"
16 #include "mojo/public/cpp/bindings/binding.h" 17 #include "mojo/public/cpp/bindings/binding.h"
17 18
18 namespace cc { 19 namespace cc {
19 class Display; 20 class Display;
20 } 21 }
21 22
23 namespace gfx {
24 class Size;
25 class ColorSpace;
26 }
27
22 namespace ui { 28 namespace ui {
23 29
24 class DisplayCompositor; 30 class DisplayCompositor;
25 31
26 // Server side representation of a WindowSurface. 32 // Server side representation of a WindowSurface.
27 class GpuCompositorFrameSink 33 class GpuCompositorFrameSink : public cc::CompositorFrameSinkSupportClient,
28 : public cc::CompositorFrameSinkSupportClient, 34 public cc::mojom::MojoCompositorFrameSink,
29 public cc::mojom::MojoCompositorFrameSink, 35 public cc::mojom::MojoCompositorFrameSinkPrivate,
30 public cc::mojom::MojoCompositorFrameSinkPrivate { 36 public cc::mojom::DisplayPrivate {
31 public: 37 public:
32 GpuCompositorFrameSink( 38 GpuCompositorFrameSink(
33 DisplayCompositor* display_compositor, 39 DisplayCompositor* display_compositor,
34 const cc::FrameSinkId& frame_sink_id, 40 const cc::FrameSinkId& frame_sink_id,
35 std::unique_ptr<cc::Display> display, 41 std::unique_ptr<cc::Display> display,
36 std::unique_ptr<cc::BeginFrameSource> begin_frame_source, 42 std::unique_ptr<cc::BeginFrameSource> begin_frame_source,
37 cc::mojom::MojoCompositorFrameSinkRequest request, 43 cc::mojom::MojoCompositorFrameSinkRequest request,
38 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request, 44 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
39 cc::mojom::MojoCompositorFrameSinkClientPtr client); 45 cc::mojom::MojoCompositorFrameSinkClientPtr client,
46 cc::mojom::DisplayPrivateRequest display_request);
rjkroege 2016/12/20 00:51:51 bike-shedding: why not display_private_request?
Alex Z. 2016/12/20 15:49:11 Because I missed it while checking all the naming
40 47
41 ~GpuCompositorFrameSink() override; 48 ~GpuCompositorFrameSink() override;
42 49
43 // cc::mojom::MojoCompositorFrameSink: 50 // cc::mojom::MojoCompositorFrameSink:
44 void EvictFrame() override; 51 void EvictFrame() override;
45 void SetNeedsBeginFrame(bool needs_begin_frame) override; 52 void SetNeedsBeginFrame(bool needs_begin_frame) override;
46 void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id, 53 void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
47 cc::CompositorFrame frame) override; 54 cc::CompositorFrame frame) override;
48 void AddSurfaceReferences( 55 void AddSurfaceReferences(
49 const std::vector<cc::SurfaceReference>& references) override; 56 const std::vector<cc::SurfaceReference>& references) override;
50 void RemoveSurfaceReferences( 57 void RemoveSurfaceReferences(
51 const std::vector<cc::SurfaceReference>& references) override; 58 const std::vector<cc::SurfaceReference>& references) override;
52 void Require(const cc::LocalFrameId& local_frame_id, 59 void Require(const cc::LocalFrameId& local_frame_id,
53 const cc::SurfaceSequence& sequence) override; 60 const cc::SurfaceSequence& sequence) override;
54 void Satisfy(const cc::SurfaceSequence& sequence) override; 61 void Satisfy(const cc::SurfaceSequence& sequence) override;
55 62
56 // cc::mojom::MojoCompositorFrameSinkPrivate: 63 // cc::mojom::MojoCompositorFrameSinkPrivate:
57 void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override; 64 void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
58 void RemoveChildFrameSink( 65 void RemoveChildFrameSink(
59 const cc::FrameSinkId& child_frame_sink_id) override; 66 const cc::FrameSinkId& child_frame_sink_id) override;
60 67
68 // cc::mojom::DisplayPrivate:
69 void SetDisplayVisible(bool visible) override;
70 void ResizeDisplay(const gfx::Size& size) override;
71 void SetDisplayColorSpace(const gfx::ColorSpace& color_space) override;
72 void SetOutputIsSecure(bool secure) override;
73
61 private: 74 private:
62 // cc::CompositorFrameSinkSupportClient implementation: 75 // cc::CompositorFrameSinkSupportClient implementation:
63 void DidReceiveCompositorFrameAck() override; 76 void DidReceiveCompositorFrameAck() override;
64 void OnBeginFrame(const cc::BeginFrameArgs& args) override; 77 void OnBeginFrame(const cc::BeginFrameArgs& args) override;
65 void ReclaimResources(const cc::ReturnedResourceArray& resources) override; 78 void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
66 void WillDrawSurface() override; 79 void WillDrawSurface() override;
67 80
68 void OnClientConnectionLost(); 81 void OnClientConnectionLost();
69 void OnPrivateConnectionLost(); 82 void OnPrivateConnectionLost();
70 83
71 DisplayCompositor* const display_compositor_; 84 DisplayCompositor* const display_compositor_;
72 85
73 cc::CompositorFrameSinkSupport support_; 86 cc::CompositorFrameSinkSupport support_;
74 87
75 bool client_connection_lost_ = false; 88 bool client_connection_lost_ = false;
76 bool private_connection_lost_ = false; 89 bool private_connection_lost_ = false;
77 90
78 cc::mojom::MojoCompositorFrameSinkClientPtr client_; 91 cc::mojom::MojoCompositorFrameSinkClientPtr client_;
79 mojo::Binding<cc::mojom::MojoCompositorFrameSink> binding_; 92 mojo::Binding<cc::mojom::MojoCompositorFrameSink> binding_;
80 mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate> private_binding_; 93 mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate>
94 compositor_frame_sink_private_binding_;
95 mojo::Binding<cc::mojom::DisplayPrivate> display_private_binding_;
81 96
82 DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink); 97 DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
83 }; 98 };
84 99
85 } // namespace ui 100 } // namespace ui
86 101
87 #endif // SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_ 102 #endif // SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698