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

Unified Diff: cc/surfaces/surface_factory.cc

Issue 2087383002: Fix destruction order between SurfaceManger and OffscreenCanvasSurfaceImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix SurfaceIdAllocator's destructor Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index d56b3174a8cc41d399468e8def7dc3991b3cdd17..435f30c674dd84a4bb08ede5dd484de822958550 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -32,8 +32,10 @@ SurfaceFactory::~SurfaceFactory() {
}
void SurfaceFactory::DestroyAll() {
- for (auto& pair : surface_map_)
- manager_->Destroy(std::move(pair.second));
+ if (manager_) {
+ for (auto& pair : surface_map_)
+ manager_->Destroy(std::move(pair.second));
+ }
surface_map_.clear();
}
@@ -50,7 +52,8 @@ void SurfaceFactory::Destroy(SurfaceId surface_id) {
DCHECK(it->second->factory().get() == this);
std::unique_ptr<Surface> surface(std::move(it->second));
surface_map_.erase(it);
- manager_->Destroy(std::move(surface));
+ if (manager_)
+ manager_->Destroy(std::move(surface));
}
void SurfaceFactory::SetPreviousFrameSurface(SurfaceId new_id,

Powered by Google App Engine
This is Rietveld 408576698