OLD | NEW |
---|---|
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/surface_manager.h" | 5 #include "cc/surfaces/surface_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 27 matching lines...) Expand all Loading... | |
38 new DirectSurfaceReferenceFactory(weak_factory_.GetWeakPtr()); | 38 new DirectSurfaceReferenceFactory(weak_factory_.GetWeakPtr()); |
39 } | 39 } |
40 | 40 |
41 SurfaceManager::~SurfaceManager() { | 41 SurfaceManager::~SurfaceManager() { |
42 DCHECK(thread_checker_.CalledOnValidThread()); | 42 DCHECK(thread_checker_.CalledOnValidThread()); |
43 | 43 |
44 // Remove all temporary references on shutdown. | 44 // Remove all temporary references on shutdown. |
45 temporary_references_.clear(); | 45 temporary_references_.clear(); |
46 temporary_reference_ranges_.clear(); | 46 temporary_reference_ranges_.clear(); |
47 | 47 |
48 GarbageCollectSurfaces(); | |
49 | |
50 for (SurfaceDestroyList::iterator it = surfaces_to_destroy_.begin(); | |
51 it != surfaces_to_destroy_.end(); | |
52 ++it) { | |
53 UnregisterSurface((*it)->surface_id()); | |
54 } | |
55 surfaces_to_destroy_.clear(); | 48 surfaces_to_destroy_.clear(); |
49 surface_map_.clear(); | |
56 } | 50 } |
57 | 51 |
58 #if DCHECK_IS_ON() | 52 #if DCHECK_IS_ON() |
59 std::string SurfaceManager::SurfaceReferencesToString() { | 53 std::string SurfaceManager::SurfaceReferencesToString() { |
60 std::stringstream str; | 54 std::stringstream str; |
61 SurfaceReferencesToStringImpl(root_surface_id_, "", &str); | 55 SurfaceReferencesToStringImpl(root_surface_id_, "", &str); |
62 // Temporary references will have an asterisk in front of them. | 56 // Temporary references will have an asterisk in front of them. |
63 for (auto& map_entry : temporary_references_) | 57 for (auto& map_entry : temporary_references_) |
64 SurfaceReferencesToStringImpl(map_entry.first, "* ", &str); | 58 SurfaceReferencesToStringImpl(map_entry.first, "* ", &str); |
65 | 59 |
66 return str.str(); | 60 return str.str(); |
67 } | 61 } |
68 #endif | 62 #endif |
69 | 63 |
70 void SurfaceManager::SetDependencyTracker( | 64 void SurfaceManager::SetDependencyTracker( |
71 SurfaceDependencyTracker* dependency_tracker) { | 65 SurfaceDependencyTracker* dependency_tracker) { |
72 dependency_tracker_ = dependency_tracker; | 66 dependency_tracker_ = dependency_tracker; |
73 } | 67 } |
74 | 68 |
75 void SurfaceManager::RequestSurfaceResolution(Surface* pending_surface) { | 69 void SurfaceManager::RequestSurfaceResolution(Surface* pending_surface) { |
76 if (dependency_tracker_) | 70 if (dependency_tracker_) |
77 dependency_tracker_->RequestSurfaceResolution(pending_surface); | 71 dependency_tracker_->RequestSurfaceResolution(pending_surface); |
78 } | 72 } |
79 | 73 |
80 std::unique_ptr<Surface> SurfaceManager::CreateSurface( | 74 base::WeakPtr<Surface> SurfaceManager::CreateSurface( |
81 base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support, | 75 base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support, |
82 const SurfaceInfo& surface_info) { | 76 const SurfaceInfo& surface_info) { |
83 DCHECK(thread_checker_.CalledOnValidThread()); | 77 DCHECK(thread_checker_.CalledOnValidThread()); |
84 DCHECK(surface_info.is_valid()); | 78 DCHECK(surface_info.is_valid()); |
85 DCHECK(compositor_frame_sink_support); | 79 DCHECK(compositor_frame_sink_support); |
86 DCHECK_EQ(surface_info.id().frame_sink_id(), | 80 DCHECK_EQ(surface_info.id().frame_sink_id(), |
87 compositor_frame_sink_support->frame_sink_id()); | 81 compositor_frame_sink_support->frame_sink_id()); |
88 | 82 |
89 // If no surface with this SurfaceId exists, simply create the surface and | 83 // If no surface with this SurfaceId exists, simply create the surface and |
90 // return. | 84 // return. |
91 auto surface_iter = surface_map_.find(surface_info.id()); | 85 auto it = surface_map_.find(surface_info.id()); |
92 if (surface_iter == surface_map_.end()) { | 86 if (it == surface_map_.end()) { |
93 auto surface = | 87 surface_map_[surface_info.id()] = |
94 base::MakeUnique<Surface>(surface_info, compositor_frame_sink_support); | 88 base::MakeUnique<Surface>(surface_info, compositor_frame_sink_support); |
95 surface_map_[surface->surface_id()] = surface.get(); | 89 return surface_map_[surface_info.id()]->AsWeakPtr(); |
96 return surface; | |
97 } | 90 } |
98 | 91 |
99 // If a surface with this SurfaceId exists and it's not marked as destroyed, | 92 // If a surface with this SurfaceId exists, it must be marked as destroyed. |
100 // we should not receive a request to create a new surface with the same | 93 // Otherwise, we wouldn't receive a request to reuse the same SurfaceId. |
101 // SurfaceId. | 94 // Remove the surface out of the garbage collector's queue and reuse it. |
102 DCHECK(surface_iter->second->destroyed()); | 95 Surface* surface = it->second.get(); |
103 | 96 DCHECK(surface->destroyed()); |
Fady Samuel
2017/06/16 18:56:38
Can we get rid of the destroy bit?
Saman Sami
2017/06/19 22:16:46
Done.
| |
104 // If a surface with this SurfaceId exists and it's marked as destroyed, | 97 surfaces_to_destroy_.erase(surface); |
105 // it means it's in the garbage collector's queue. We simply take it out of | |
106 // the queue and reuse it. | |
107 auto it = | |
108 std::find_if(surfaces_to_destroy_.begin(), surfaces_to_destroy_.end(), | |
109 [&surface_info](const std::unique_ptr<Surface>& surface) { | |
110 return surface->surface_id() == surface_info.id(); | |
111 }); | |
112 DCHECK(it != surfaces_to_destroy_.end()); | |
113 std::unique_ptr<Surface> surface = std::move(*it); | |
114 surfaces_to_destroy_.erase(it); | |
115 surface->set_destroyed(false); | 98 surface->set_destroyed(false); |
116 DCHECK_EQ(compositor_frame_sink_support.get(), | 99 DCHECK_EQ(compositor_frame_sink_support.get(), |
117 surface->compositor_frame_sink_support().get()); | 100 surface->compositor_frame_sink_support().get()); |
118 return surface; | 101 return surface->AsWeakPtr(); |
119 } | 102 } |
120 | 103 |
121 void SurfaceManager::DestroySurface(std::unique_ptr<Surface> surface) { | 104 void SurfaceManager::DestroySurface(Surface* surface) { |
122 DCHECK(thread_checker_.CalledOnValidThread()); | 105 DCHECK(thread_checker_.CalledOnValidThread()); |
106 DCHECK(!surface->destroyed()); | |
123 surface->set_destroyed(true); | 107 surface->set_destroyed(true); |
124 for (auto& observer : observer_list_) | 108 for (auto& observer : observer_list_) |
125 observer.OnSurfaceDestroyed(surface->surface_id()); | 109 observer.OnSurfaceDestroyed(surface->surface_id()); |
126 surfaces_to_destroy_.push_back(std::move(surface)); | 110 surfaces_to_destroy_.insert(surface); |
127 GarbageCollectSurfaces(); | 111 GarbageCollectSurfaces(); |
128 } | 112 } |
129 | 113 |
130 void SurfaceManager::RequireSequence(const SurfaceId& surface_id, | 114 void SurfaceManager::RequireSequence(const SurfaceId& surface_id, |
131 const SurfaceSequence& sequence) { | 115 const SurfaceSequence& sequence) { |
132 auto* surface = GetSurfaceForId(surface_id); | 116 auto* surface = GetSurfaceForId(surface_id); |
133 if (!surface) { | 117 if (!surface) { |
134 DLOG(ERROR) << "Attempting to require callback on nonexistent surface"; | 118 DLOG(ERROR) << "Attempting to require callback on nonexistent surface"; |
135 return; | 119 return; |
136 } | 120 } |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
225 } | 209 } |
226 | 210 |
227 void SurfaceManager::GarbageCollectSurfaces() { | 211 void SurfaceManager::GarbageCollectSurfaces() { |
228 if (surfaces_to_destroy_.empty()) | 212 if (surfaces_to_destroy_.empty()) |
229 return; | 213 return; |
230 | 214 |
231 SurfaceIdSet reachable_surfaces = using_surface_references() | 215 SurfaceIdSet reachable_surfaces = using_surface_references() |
232 ? GetLiveSurfacesForReferences() | 216 ? GetLiveSurfacesForReferences() |
233 : GetLiveSurfacesForSequences(); | 217 : GetLiveSurfacesForSequences(); |
234 | 218 |
235 std::vector<std::unique_ptr<Surface>> surfaces_to_delete; | 219 std::vector<SurfaceId> surfaces_to_delete; |
236 | 220 |
237 // Delete all destroyed and unreachable surfaces. | 221 // Delete all destroyed and unreachable surfaces. |
238 for (auto iter = surfaces_to_destroy_.begin(); | 222 for (auto iter = surfaces_to_destroy_.begin(); |
239 iter != surfaces_to_destroy_.end();) { | 223 iter != surfaces_to_destroy_.end();) { |
240 SurfaceId surface_id = (*iter)->surface_id(); | 224 SurfaceId surface_id = (*iter)->surface_id(); |
241 if (reachable_surfaces.count(surface_id) == 0) { | 225 if (reachable_surfaces.count(surface_id) == 0) { |
242 UnregisterSurface(surface_id); | 226 surfaces_to_delete.push_back(surface_id); |
243 surfaces_to_delete.push_back(std::move(*iter)); | |
244 iter = surfaces_to_destroy_.erase(iter); | 227 iter = surfaces_to_destroy_.erase(iter); |
245 } else { | 228 } else { |
246 ++iter; | 229 ++iter; |
247 } | 230 } |
248 } | 231 } |
249 | 232 |
250 // ~Surface() draw callback could modify |surfaces_to_destroy_|. | 233 // ~Surface() draw callback could modify |surfaces_to_destroy_|. |
251 surfaces_to_delete.clear(); | 234 for (const SurfaceId& surface_id : surfaces_to_delete) |
235 DestroySurfaceInternal(surface_id); | |
252 } | 236 } |
253 | 237 |
254 SurfaceManager::SurfaceIdSet SurfaceManager::GetLiveSurfacesForReferences() { | 238 SurfaceManager::SurfaceIdSet SurfaceManager::GetLiveSurfacesForReferences() { |
255 DCHECK(using_surface_references()); | 239 DCHECK(using_surface_references()); |
256 | 240 |
257 SurfaceIdSet reachable_surfaces; | 241 SurfaceIdSet reachable_surfaces; |
258 | 242 |
259 // Walk down from the root and mark each SurfaceId we encounter as reachable. | 243 // Walk down from the root and mark each SurfaceId we encounter as reachable. |
260 std::queue<SurfaceId> surface_queue; | 244 std::queue<SurfaceId> surface_queue; |
261 surface_queue.push(root_surface_id_); | 245 surface_queue.push(root_surface_id_); |
(...skipping 23 matching lines...) Expand all Loading... | |
285 // Simple mark and sweep GC. | 269 // Simple mark and sweep GC. |
286 // TODO(jbauman): Reduce the amount of work when nothing needs to be | 270 // TODO(jbauman): Reduce the amount of work when nothing needs to be |
287 // destroyed. | 271 // destroyed. |
288 std::vector<SurfaceId> live_surfaces; | 272 std::vector<SurfaceId> live_surfaces; |
289 std::unordered_set<SurfaceId, SurfaceIdHash> live_surfaces_set; | 273 std::unordered_set<SurfaceId, SurfaceIdHash> live_surfaces_set; |
290 | 274 |
291 // GC roots are surfaces that have not been destroyed, or have not had all | 275 // GC roots are surfaces that have not been destroyed, or have not had all |
292 // their destruction dependencies satisfied. | 276 // their destruction dependencies satisfied. |
293 for (auto& map_entry : surface_map_) { | 277 for (auto& map_entry : surface_map_) { |
294 const SurfaceId& surface_id = map_entry.first; | 278 const SurfaceId& surface_id = map_entry.first; |
295 Surface* surface = map_entry.second; | 279 Surface* surface = map_entry.second.get(); |
296 surface->SatisfyDestructionDependencies(&satisfied_sequences_, | 280 surface->SatisfyDestructionDependencies(&satisfied_sequences_, |
297 framesink_manager_.GetValidFrameSinkIds()); | 281 framesink_manager_.GetValidFrameSinkIds()); |
298 | 282 |
299 if (!surface->destroyed() || surface->GetDestructionDependencyCount() > 0) { | 283 if (!surface->destroyed() || surface->GetDestructionDependencyCount() > 0) { |
300 live_surfaces_set.insert(surface_id); | 284 live_surfaces_set.insert(surface_id); |
301 live_surfaces.push_back(surface_id); | 285 live_surfaces.push_back(surface_id); |
302 } | 286 } |
303 } | 287 } |
304 | 288 |
305 // Mark all surfaces reachable from live surfaces by adding them to | 289 // Mark all surfaces reachable from live surfaces by adding them to |
306 // live_surfaces and live_surfaces_set. | 290 // live_surfaces and live_surfaces_set. |
307 for (size_t i = 0; i < live_surfaces.size(); i++) { | 291 for (size_t i = 0; i < live_surfaces.size(); i++) { |
308 Surface* surf = surface_map_[live_surfaces[i]]; | 292 Surface* surf = surface_map_[live_surfaces[i]].get(); |
309 DCHECK(surf); | 293 DCHECK(surf); |
310 | 294 |
311 const auto& children = GetSurfacesReferencedByParent(surf->surface_id()); | 295 const auto& children = GetSurfacesReferencedByParent(surf->surface_id()); |
312 for (const SurfaceId& id : children) { | 296 for (const SurfaceId& id : children) { |
313 if (live_surfaces_set.count(id)) | 297 if (live_surfaces_set.count(id)) |
314 continue; | 298 continue; |
315 | 299 |
316 Surface* surf2 = GetSurfaceForId(id); | 300 Surface* surf2 = GetSurfaceForId(id); |
317 if (surf2) { | 301 if (surf2) { |
318 live_surfaces.push_back(id); | 302 live_surfaces.push_back(id); |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
455 const FrameSinkId& child_frame_sink_id) { | 439 const FrameSinkId& child_frame_sink_id) { |
456 framesink_manager_.UnregisterFrameSinkHierarchy(parent_frame_sink_id, | 440 framesink_manager_.UnregisterFrameSinkHierarchy(parent_frame_sink_id, |
457 child_frame_sink_id); | 441 child_frame_sink_id); |
458 } | 442 } |
459 | 443 |
460 Surface* SurfaceManager::GetSurfaceForId(const SurfaceId& surface_id) { | 444 Surface* SurfaceManager::GetSurfaceForId(const SurfaceId& surface_id) { |
461 DCHECK(thread_checker_.CalledOnValidThread()); | 445 DCHECK(thread_checker_.CalledOnValidThread()); |
462 SurfaceMap::iterator it = surface_map_.find(surface_id); | 446 SurfaceMap::iterator it = surface_map_.find(surface_id); |
463 if (it == surface_map_.end()) | 447 if (it == surface_map_.end()) |
464 return nullptr; | 448 return nullptr; |
465 return it->second; | 449 return it->second.get(); |
466 } | 450 } |
467 | 451 |
468 bool SurfaceManager::SurfaceModified(const SurfaceId& surface_id, | 452 bool SurfaceManager::SurfaceModified(const SurfaceId& surface_id, |
469 const BeginFrameAck& ack) { | 453 const BeginFrameAck& ack) { |
470 CHECK(thread_checker_.CalledOnValidThread()); | 454 CHECK(thread_checker_.CalledOnValidThread()); |
471 bool changed = false; | 455 bool changed = false; |
472 for (auto& observer : observer_list_) | 456 for (auto& observer : observer_list_) |
473 changed |= observer.OnSurfaceDamaged(surface_id, ack); | 457 changed |= observer.OnSurfaceDamaged(surface_id, ack); |
474 return changed; | 458 return changed; |
475 } | 459 } |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
513 dependency_tracker_->OnSurfaceDiscarded(surface); | 497 dependency_tracker_->OnSurfaceDiscarded(surface); |
514 } | 498 } |
515 | 499 |
516 void SurfaceManager::SurfaceDamageExpected(const SurfaceId& surface_id, | 500 void SurfaceManager::SurfaceDamageExpected(const SurfaceId& surface_id, |
517 const BeginFrameArgs& args) { | 501 const BeginFrameArgs& args) { |
518 DCHECK(thread_checker_.CalledOnValidThread()); | 502 DCHECK(thread_checker_.CalledOnValidThread()); |
519 for (auto& observer : observer_list_) | 503 for (auto& observer : observer_list_) |
520 observer.OnSurfaceDamageExpected(surface_id, args); | 504 observer.OnSurfaceDamageExpected(surface_id, args); |
521 } | 505 } |
522 | 506 |
523 void SurfaceManager::UnregisterSurface(const SurfaceId& surface_id) { | 507 void SurfaceManager::DestroySurfaceInternal(const SurfaceId& surface_id) { |
524 DCHECK(thread_checker_.CalledOnValidThread()); | 508 DCHECK(thread_checker_.CalledOnValidThread()); |
525 SurfaceMap::iterator it = surface_map_.find(surface_id); | 509 SurfaceMap::iterator it = surface_map_.find(surface_id); |
526 DCHECK(it != surface_map_.end()); | 510 DCHECK(it != surface_map_.end()); |
527 surface_map_.erase(it); | 511 surface_map_.erase(it); |
528 RemoveAllSurfaceReferences(surface_id); | 512 RemoveAllSurfaceReferences(surface_id); |
529 } | 513 } |
530 | 514 |
531 #if DCHECK_IS_ON() | 515 #if DCHECK_IS_ON() |
532 void SurfaceManager::SurfaceReferencesToStringImpl(const SurfaceId& surface_id, | 516 void SurfaceManager::SurfaceReferencesToStringImpl(const SurfaceId& surface_id, |
533 std::string indent, | 517 std::string indent, |
(...skipping 25 matching lines...) Expand all Loading... | |
559 *str << "\n"; | 543 *str << "\n"; |
560 | 544 |
561 // If the current surface has references to children, sort children and print | 545 // If the current surface has references to children, sort children and print |
562 // references for each child. | 546 // references for each child. |
563 for (const SurfaceId& child_id : GetSurfacesReferencedByParent(surface_id)) | 547 for (const SurfaceId& child_id : GetSurfacesReferencedByParent(surface_id)) |
564 SurfaceReferencesToStringImpl(child_id, indent + " ", str); | 548 SurfaceReferencesToStringImpl(child_id, indent + " ", str); |
565 } | 549 } |
566 #endif // DCHECK_IS_ON() | 550 #endif // DCHECK_IS_ON() |
567 | 551 |
568 } // namespace cc | 552 } // namespace cc |
OLD | NEW |