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

Side by Side Diff: cc/surfaces/direct_compositor_frame_sink.cc

Issue 2612083002: DirectCompositorFrameSink Uses CompositorFrameSinkSupport (Closed)
Patch Set: Added NON_EXPORTED_BASE Created 3 years, 10 months 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
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "cc/surfaces/direct_compositor_frame_sink.h" 5 #include "cc/surfaces/direct_compositor_frame_sink.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_sink_client.h" 9 #include "cc/output/compositor_frame_sink_client.h"
10 #include "cc/surfaces/display.h" 10 #include "cc/surfaces/display.h"
(...skipping 11 matching lines...) Expand all
22 scoped_refptr<ContextProvider> context_provider, 22 scoped_refptr<ContextProvider> context_provider,
23 scoped_refptr<ContextProvider> worker_context_provider, 23 scoped_refptr<ContextProvider> worker_context_provider,
24 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 24 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
25 SharedBitmapManager* shared_bitmap_manager) 25 SharedBitmapManager* shared_bitmap_manager)
26 : CompositorFrameSink(std::move(context_provider), 26 : CompositorFrameSink(std::move(context_provider),
27 std::move(worker_context_provider), 27 std::move(worker_context_provider),
28 gpu_memory_buffer_manager, 28 gpu_memory_buffer_manager,
29 shared_bitmap_manager), 29 shared_bitmap_manager),
30 frame_sink_id_(frame_sink_id), 30 frame_sink_id_(frame_sink_id),
31 surface_manager_(surface_manager), 31 surface_manager_(surface_manager),
32 display_(display), 32 display_(display) {
33 factory_(frame_sink_id, surface_manager, this) {
34 DCHECK(thread_checker_.CalledOnValidThread()); 33 DCHECK(thread_checker_.CalledOnValidThread());
35 capabilities_.can_force_reclaim_resources = true; 34 capabilities_.can_force_reclaim_resources = true;
36 // Display and DirectCompositorFrameSink share a GL context, so sync 35 // Display and DirectCompositorFrameSink share a GL context, so sync
37 // points aren't needed when passing resources between them. 36 // points aren't needed when passing resources between them.
38 capabilities_.delegated_sync_points_required = false; 37 capabilities_.delegated_sync_points_required = false;
39 factory_.set_needs_sync_points(false);
40 } 38 }
41 39
42 DirectCompositorFrameSink::DirectCompositorFrameSink( 40 DirectCompositorFrameSink::DirectCompositorFrameSink(
43 const FrameSinkId& frame_sink_id, 41 const FrameSinkId& frame_sink_id,
44 SurfaceManager* surface_manager, 42 SurfaceManager* surface_manager,
45 Display* display, 43 Display* display,
46 scoped_refptr<VulkanContextProvider> vulkan_context_provider) 44 scoped_refptr<VulkanContextProvider> vulkan_context_provider)
47 : CompositorFrameSink(std::move(vulkan_context_provider)), 45 : CompositorFrameSink(std::move(vulkan_context_provider)),
48 frame_sink_id_(frame_sink_id), 46 frame_sink_id_(frame_sink_id),
49 surface_manager_(surface_manager), 47 surface_manager_(surface_manager),
50 display_(display), 48 display_(display) {
51 factory_(frame_sink_id_, surface_manager, this) {
52 DCHECK(thread_checker_.CalledOnValidThread()); 49 DCHECK(thread_checker_.CalledOnValidThread());
53 capabilities_.can_force_reclaim_resources = true; 50 capabilities_.can_force_reclaim_resources = true;
54 } 51 }
55 52
56 DirectCompositorFrameSink::~DirectCompositorFrameSink() { 53 DirectCompositorFrameSink::~DirectCompositorFrameSink() {
57 DCHECK(thread_checker_.CalledOnValidThread()); 54 DCHECK(thread_checker_.CalledOnValidThread());
58 } 55 }
59 56
60 bool DirectCompositorFrameSink::BindToClient( 57 bool DirectCompositorFrameSink::BindToClient(
61 CompositorFrameSinkClient* client) { 58 CompositorFrameSinkClient* client) {
62 DCHECK(thread_checker_.CalledOnValidThread()); 59 DCHECK(thread_checker_.CalledOnValidThread());
63 60
64 if (!CompositorFrameSink::BindToClient(client)) 61 if (!CompositorFrameSink::BindToClient(client))
65 return false; 62 return false;
66 63
67 surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
68
69 // We want the Display's output surface to hear about lost context, and since 64 // We want the Display's output surface to hear about lost context, and since
70 // this shares a context with it, we should not be listening for lost context 65 // this shares a context with it, we should not be listening for lost context
71 // callbacks on the context here. 66 // callbacks on the context here.
72 if (auto* cp = context_provider()) 67 if (auto* cp = context_provider())
73 cp->SetLostContextCallback(base::Closure()); 68 cp->SetLostContextCallback(base::Closure());
74 69
70 constexpr bool is_root = true;
71 constexpr bool handles_frame_sink_id_invalidation = false;
72 support_ = base::MakeUnique<CompositorFrameSinkSupport>(
73 this, surface_manager_, frame_sink_id_, is_root,
74 handles_frame_sink_id_invalidation,
75 capabilities_.delegated_sync_points_required);
76 begin_frame_source_ = base::MakeUnique<ExternalBeginFrameSource>(this);
77 client_->SetBeginFrameSource(begin_frame_source_.get());
78
75 // Avoid initializing GL context here, as this should be sharing the 79 // Avoid initializing GL context here, as this should be sharing the
76 // Display's context. 80 // Display's context.
77 display_->Initialize(this, surface_manager_); 81 display_->Initialize(this, surface_manager_);
78 return true; 82 return true;
79 } 83 }
80 84
81 void DirectCompositorFrameSink::DetachFromClient() { 85 void DirectCompositorFrameSink::DetachFromClient() {
86 client_->SetBeginFrameSource(nullptr);
87 begin_frame_source_.reset();
88
82 // Unregister the SurfaceFactoryClient here instead of the dtor so that only 89 // Unregister the SurfaceFactoryClient here instead of the dtor so that only
83 // one client is alive for this namespace at any given time. 90 // one client is alive for this namespace at any given time.
84 surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_); 91 support_.reset();
85 factory_.EvictSurface();
86 92
87 CompositorFrameSink::DetachFromClient(); 93 CompositorFrameSink::DetachFromClient();
88 } 94 }
89 95
90 void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) { 96 void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
91 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); 97 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
92 if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) { 98 if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
93 delegated_local_surface_id_ = surface_id_allocator_.GenerateId(); 99 delegated_local_surface_id_ = surface_id_allocator_.GenerateId();
94 last_swap_frame_size_ = frame_size; 100 last_swap_frame_size_ = frame_size;
95 } 101 }
96 display_->SetLocalSurfaceId(delegated_local_surface_id_, 102 display_->SetLocalSurfaceId(delegated_local_surface_id_,
97 frame.metadata.device_scale_factor); 103 frame.metadata.device_scale_factor);
98 104
99 factory_.SubmitCompositorFrame( 105 support_->SubmitCompositorFrame(delegated_local_surface_id_,
100 delegated_local_surface_id_, std::move(frame), 106 std::move(frame));
101 base::Bind(&DirectCompositorFrameSink::DidDrawCallback,
102 base::Unretained(this)));
103 } 107 }
104 108
105 void DirectCompositorFrameSink::ForceReclaimResources() { 109 void DirectCompositorFrameSink::ForceReclaimResources() {
106 if (delegated_local_surface_id_.is_valid()) 110 support_->ForceReclaimResources();
107 factory_.ClearSurface();
108 }
109
110 void DirectCompositorFrameSink::ReturnResources(
111 const ReturnedResourceArray& resources) {
112 if (client_)
113 client_->ReclaimResources(resources);
114 }
115
116 void DirectCompositorFrameSink::SetBeginFrameSource(
117 BeginFrameSource* begin_frame_source) {
118 DCHECK(client_);
119 client_->SetBeginFrameSource(begin_frame_source);
120 } 111 }
121 112
122 void DirectCompositorFrameSink::DisplayOutputSurfaceLost() { 113 void DirectCompositorFrameSink::DisplayOutputSurfaceLost() {
123 is_lost_ = true; 114 is_lost_ = true;
124 client_->DidLoseCompositorFrameSink(); 115 client_->DidLoseCompositorFrameSink();
125 } 116 }
126 117
127 void DirectCompositorFrameSink::DisplayWillDrawAndSwap( 118 void DirectCompositorFrameSink::DisplayWillDrawAndSwap(
128 bool will_draw_and_swap, 119 bool will_draw_and_swap,
129 const RenderPassList& render_passes) { 120 const RenderPassList& render_passes) {
130 // This notification is not relevant to our client outside of tests. 121 // This notification is not relevant to our client outside of tests.
131 } 122 }
132 123
133 void DirectCompositorFrameSink::DisplayDidDrawAndSwap() { 124 void DirectCompositorFrameSink::DisplayDidDrawAndSwap() {
134 // This notification is not relevant to our client outside of tests. We 125 // This notification is not relevant to our client outside of tests. We
135 // unblock the client from DidDrawCallback() when the surface is going to 126 // unblock the client from DidDrawCallback() when the surface is going to
136 // be drawn. 127 // be drawn.
137 } 128 }
138 129
139 void DirectCompositorFrameSink::DidDrawCallback() { 130 void DirectCompositorFrameSink::DidReceiveCompositorFrameAck() {
140 client_->DidReceiveCompositorFrameAck(); 131 client_->DidReceiveCompositorFrameAck();
141 } 132 }
142 133
134 void DirectCompositorFrameSink::OnBeginFrame(const BeginFrameArgs& args) {
135 begin_frame_source_->OnBeginFrame(args);
136 }
137
138 void DirectCompositorFrameSink::ReclaimResources(
139 const ReturnedResourceArray& resources) {
140 client_->ReclaimResources(resources);
141 }
142
143 void DirectCompositorFrameSink::WillDrawSurface(
144 const LocalSurfaceId& local_surface_id,
145 const gfx::Rect& damage_rect) {
146 // TODO(staraz): Implement this.
147 }
148
149 void DirectCompositorFrameSink::OnNeedsBeginFrames(bool needs_begin_frame) {
150 support_->SetNeedsBeginFrame(needs_begin_frame);
151 }
152
143 } // namespace cc 153 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/direct_compositor_frame_sink.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698