Revert of SurfaceManager::CreateSurface must set the surface's factory

cc/surfaces/surface_manager.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_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <queue>
@@ skipping 90 matching lines @@
   // the queue and reuse it.
   auto it =
       std::find_if(surfaces_to_destroy_.begin(), surfaces_to_destroy_.end(),
                    [&surface_id](const std::unique_ptr<Surface>& surface) {
                      return surface->surface_id() == surface_id;
                    });
   DCHECK(it != surfaces_to_destroy_.end());
   std::unique_ptr<Surface> surface = std::move(*it);
   surfaces_to_destroy_.erase(it);
   surface->set_destroyed(false);
-  // If the surface was used by another factory, we should update its factory.
-  // The old frames must be evicted because the new factory is not capable of
-  // returning their resources.
-  // TODO(samans): This should not be necessary once crbug.com/701988 is fixed.
-  if (surface->factory() == nullptr) {
-    DLOG(ERROR) << "Surface is being reused by another factory. "
-                   "Resources can potentially leak. id="
-                << surface_id;
-    surface->Reset();
-    surface->set_factory(surface_factory);
-  }
   DCHECK_EQ(surface_factory.get(), surface->factory().get());
   return surface;
 }
 
 void SurfaceManager::DestroySurface(std::unique_ptr<Surface> surface) {
   DCHECK(thread_checker_.CalledOnValidThread());
-
   surface->set_destroyed(true);
   surfaces_to_destroy_.push_back(std::move(surface));
   GarbageCollectSurfaces();
 }
 
 void SurfaceManager::RequireSequence(const SurfaceId& surface_id,
                                      const SurfaceSequence& sequence) {
   auto* surface = GetSurfaceForId(surface_id);
   if (!surface) {
     DLOG(ERROR) << "Attempting to require callback on nonexistent surface";
@@ skipping 397 matching lines @@
     std::vector<SurfaceId> children(iter->second.begin(), iter->second.end());
     std::sort(children.begin(), children.end());
 
     for (const SurfaceId& child_id : children)
       SurfaceReferencesToStringImpl(child_id, indent + "  ", str);
   }
 }
 #endif  // DCHECK_IS_ON()
 
 }  // namespace cc