Add SurfaceFactory::Reset

cc/surfaces/surface_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 SurfaceFactory::SurfaceFactory(const FrameSinkId& frame_sink_id,
                                SurfaceManager* manager,
                                SurfaceFactoryClient* client)
     : frame_sink_id_(frame_sink_id),
       manager_(manager),
       client_(client),
       holder_(client),
-      needs_sync_points_(true) {}
+      needs_sync_points_(true),
+      weak_factory_(this) {}
 
 SurfaceFactory::~SurfaceFactory() {
   if (!surface_map_.empty()) {
     LOG(ERROR) << "SurfaceFactory has " << surface_map_.size()
                << " entries in map on destruction.";
   }
   DestroyAll();
 }
 
 void SurfaceFactory::DestroyAll() {
   if (manager_) {
     for (auto& pair : surface_map_)
       manager_->Destroy(std::move(pair.second));
   }
   surface_map_.clear();
 }
 
+void SurfaceFactory::Reset() {
+  DestroyAll();
+  // Disown Surfaces that are still alive so that they don't try to unref
+  // resources that we're not tracking any more.
+  weak_factory_.InvalidateWeakPtrs();
+  holder_.Reset();
+}
+
 void SurfaceFactory::Create(const LocalFrameId& local_frame_id) {
-  std::unique_ptr<Surface> surface(base::MakeUnique<Surface>(
-      SurfaceId(frame_sink_id_, local_frame_id), this));
+  auto surface(base::MakeUnique<Surface>(
+      SurfaceId(frame_sink_id_, local_frame_id), weak_factory_.GetWeakPtr()));
   manager_->RegisterSurface(surface.get());
   DCHECK(!surface_map_.count(local_frame_id));
   surface_map_[local_frame_id] = std::move(surface);
 }
 
 void SurfaceFactory::Destroy(const LocalFrameId& local_frame_id) {
   OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
   std::unique_ptr<Surface> surface(std::move(it->second));
@@ skipping 63 matching lines @@
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
 }  // namespace cc