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 #include "components/exo/compositor_frame_sink_holder.h" | 5 #include "components/exo/compositor_frame_sink_holder.h" |
6 | 6 |
7 #include "base/callback_helpers.h" | |
7 #include "cc/resources/returned_resource.h" | 8 #include "cc/resources/returned_resource.h" |
8 #include "components/exo/surface.h" | 9 #include "components/exo/surface.h" |
9 | 10 |
10 namespace exo { | 11 namespace exo { |
11 | 12 |
12 //////////////////////////////////////////////////////////////////////////////// | 13 //////////////////////////////////////////////////////////////////////////////// |
13 // CompositorFrameSinkHolder, public: | 14 // CompositorFrameSinkHolder, public: |
14 | 15 |
15 CompositorFrameSinkHolder::CompositorFrameSinkHolder( | 16 CompositorFrameSinkHolder::CompositorFrameSinkHolder( |
16 Surface* surface, | 17 Surface* surface, |
17 std::unique_ptr<CompositorFrameSink> frame_sink, | 18 std::unique_ptr<CompositorFrameSink> frame_sink, |
18 cc::mojom::MojoCompositorFrameSinkClientRequest request) | 19 cc::mojom::MojoCompositorFrameSinkClientRequest request) |
19 : surface_(surface), | 20 : surface_(surface), |
20 frame_sink_(std::move(frame_sink)), | 21 frame_sink_(std::move(frame_sink)), |
21 begin_frame_source_(base::MakeUnique<cc::ExternalBeginFrameSource>(this)), | 22 begin_frame_source_(base::MakeUnique<cc::ExternalBeginFrameSource>(this)), |
22 binding_(this, std::move(request)), | 23 binding_(this, std::move(request)), |
23 weak_factory_(this) { | 24 weak_factory_(this) { |
24 surface_->AddSurfaceObserver(this); | 25 surface_->AddSurfaceObserver(this); |
25 } | 26 } |
26 | 27 |
27 bool CompositorFrameSinkHolder::HasReleaseCallbackForResource( | 28 bool CompositorFrameSinkHolder::HasReleaseCallbackForResource( |
28 cc::ResourceId id) { | 29 cc::ResourceId id) { |
29 return release_callbacks_.find(id) != release_callbacks_.end(); | 30 return release_callbacks_.find(id) != release_callbacks_.end(); |
30 } | 31 } |
31 | 32 |
32 void CompositorFrameSinkHolder::AddResourceReleaseCallback( | 33 void CompositorFrameSinkHolder::AddResourceReleaseCallback( |
33 cc::ResourceId id, | 34 cc::ResourceId id, |
34 std::unique_ptr<cc::SingleReleaseCallback> callback) { | 35 std::unique_ptr<cc::SingleReleaseCallback> callback) { |
35 release_callbacks_[id] = std::make_pair(this, std::move(callback)); | 36 release_callbacks_[id] = std::move(callback); |
36 } | 37 } |
37 | 38 |
38 void CompositorFrameSinkHolder::ActivateFrameCallbacks( | 39 void CompositorFrameSinkHolder::ActivateFrameCallbacks( |
39 std::list<FrameCallback>* frame_callbacks) { | 40 std::list<FrameCallback>* frame_callbacks) { |
40 active_frame_callbacks_.splice(active_frame_callbacks_.end(), | 41 active_frame_callbacks_.splice(active_frame_callbacks_.end(), |
41 *frame_callbacks); | 42 *frame_callbacks); |
42 UpdateNeedsBeginFrame(); | 43 UpdateNeedsBeginFrame(); |
43 } | 44 } |
44 | 45 |
45 void CompositorFrameSinkHolder::CancelFrameCallbacks() { | 46 void CompositorFrameSinkHolder::CancelFrameCallbacks() { |
(...skipping 27 matching lines...) Expand all Loading... | |
73 void CompositorFrameSinkHolder::OnBeginFrame(const cc::BeginFrameArgs& args) { | 74 void CompositorFrameSinkHolder::OnBeginFrame(const cc::BeginFrameArgs& args) { |
74 while (!active_frame_callbacks_.empty()) { | 75 while (!active_frame_callbacks_.empty()) { |
75 active_frame_callbacks_.front().Run(args.frame_time); | 76 active_frame_callbacks_.front().Run(args.frame_time); |
76 active_frame_callbacks_.pop_front(); | 77 active_frame_callbacks_.pop_front(); |
77 } | 78 } |
78 begin_frame_source_->OnBeginFrame(args); | 79 begin_frame_source_->OnBeginFrame(args); |
79 } | 80 } |
80 | 81 |
81 void CompositorFrameSinkHolder::ReclaimResources( | 82 void CompositorFrameSinkHolder::ReclaimResources( |
82 const cc::ReturnedResourceArray& resources) { | 83 const cc::ReturnedResourceArray& resources) { |
84 scoped_refptr<CompositorFrameSinkHolder> holder(this); | |
reveman
2016/12/21 20:05:42
Please remove this and use PostTask instead. Insta
Alex Z.
2016/12/21 21:30:11
Sorry about this. I forgot to remove the line afte
| |
83 for (auto& resource : resources) { | 85 for (auto& resource : resources) { |
84 auto it = release_callbacks_.find(resource.id); | 86 auto it = release_callbacks_.find(resource.id); |
85 DCHECK(it != release_callbacks_.end()); | 87 DCHECK(it != release_callbacks_.end()); |
86 std::unique_ptr<cc::SingleReleaseCallback> callback = | 88 base::ScopedClosureRunner runner(base::Bind( |
87 std::move(it->second.second); | 89 &cc::SingleReleaseCallback::Run, base::Passed(std::move(it->second)), |
90 resource.sync_token, resource.lost)); | |
88 release_callbacks_.erase(it); | 91 release_callbacks_.erase(it); |
89 callback->Run(resource.sync_token, resource.lost); | |
90 } | 92 } |
91 } | 93 } |
92 | 94 |
93 void CompositorFrameSinkHolder::WillDrawSurface() { | 95 void CompositorFrameSinkHolder::WillDrawSurface() { |
94 if (surface_) | 96 if (surface_) |
95 surface_->WillDraw(); | 97 surface_->WillDraw(); |
96 | 98 |
97 UpdateNeedsBeginFrame(); | 99 UpdateNeedsBeginFrame(); |
98 } | 100 } |
99 | 101 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
133 | 135 |
134 bool needs_begin_frame = !active_frame_callbacks_.empty(); | 136 bool needs_begin_frame = !active_frame_callbacks_.empty(); |
135 if (needs_begin_frame == needs_begin_frame_) | 137 if (needs_begin_frame == needs_begin_frame_) |
136 return; | 138 return; |
137 | 139 |
138 needs_begin_frame_ = needs_begin_frame; | 140 needs_begin_frame_ = needs_begin_frame; |
139 OnNeedsBeginFrames(needs_begin_frame_); | 141 OnNeedsBeginFrames(needs_begin_frame_); |
140 } | 142 } |
141 | 143 |
142 } // namespace exo | 144 } // namespace exo |
OLD | NEW |