Remove SurfaceFactory::Create and SurfaceFactory::Destroy

cc/surfaces/surface_factory.cc

Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 36a79ee9e9ad0557aa92978a661bb961dd56ed6b..e3c142880258e1817e37913dc7ea61bdd8d20c39 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -26,10 +26,6 @@ SurfaceFactory::SurfaceFactory(const FrameSinkId& frame_sink_id,
       weak_factory_(this) {}
 
 SurfaceFactory::~SurfaceFactory() {
-  if (!surface_map_.empty()) {
-    LOG(ERROR) << "SurfaceFactory has " << surface_map_.size()
-               << " entries in map on destruction.";
-  }
   DestroyAll();
 }
 
@@ -39,6 +35,7 @@ void SurfaceFactory::DestroyAll() {
       manager_->Destroy(std::move(pair.second));
   }
   surface_map_.clear();
+  last_local_frame_id_ = LocalFrameId();
 }
 
 void SurfaceFactory::Reset() {
@@ -82,6 +79,12 @@ void SurfaceFactory::SubmitCompositorFrame(const LocalFrameId& local_frame_id,
                                            CompositorFrame frame,
                                            const DrawCallback& callback) {
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
+  if (local_frame_id != last_local_frame_id_) {
+    if (!last_local_frame_id_.is_null())
+      Destroy(last_local_frame_id_);
+    Create(local_frame_id);
+  }
+  last_local_frame_id_ = local_frame_id;
   OwningSurfaceMap::iterator it = surface_map_.find(local_frame_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
@@ -118,7 +121,8 @@ void SurfaceFactory::RequestCopyOfSurface(
 
 void SurfaceFactory::WillDrawSurface(const LocalFrameId& id,
                                      const gfx::Rect& damage_rect) {
-  client_->WillDrawSurface(id, damage_rect);
+  if (client_)

[Fady Samuel, 2016/11/08 22:23:59]

Is this necessary?

[Saman Sami, 2016/11/11 17:49:58]

Removed

+    client_->WillDrawSurface(id, damage_rect);
 }
 
 void SurfaceFactory::ReceiveFromChild(