Remove SurfaceFactory::Create and SurfaceFactory::Destroy

cc/surfaces/surface_factory.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_FACTORY_H_
 #define CC_SURFACES_SURFACE_FACTORY_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/optional.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_resource_holder.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace gfx {
 class Size;
 }
 
@@ skipping 13 matching lines @@
  public:
   using DrawCallback = base::Callback<void()>;
 
   SurfaceFactory(const FrameSinkId& frame_sink_id,
                  SurfaceManager* manager,
                  SurfaceFactoryClient* client);
   ~SurfaceFactory();
 
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
-  void Create(const LocalFrameId& local_frame_id);
-  void Destroy(const LocalFrameId& local_frame_id);
-
-  // Destroys all surfaces.
-  void DestroyAll();
-
   // Destroys and disown all surfaces, and reset all resource references. This
   // is useful when resources are invalid (e.g. lost context).
   void Reset();
 
   // Set that the current frame on new_id is to be treated as the successor to
   // the current frame on old_id for the purposes of calculating damage.
   void SetPreviousFrameSurface(const LocalFrameId& new_id,
                                const LocalFrameId& old_id);
 
   // A frame can only be submitted to a surface created by this factory,
@@ skipping 21 matching lines @@
   // example if the Display shares a context with the creator.
   bool needs_sync_points() const { return needs_sync_points_; }
   void set_needs_sync_points(bool needs) { needs_sync_points_ = needs; }
 
   // SurfaceFactory's owner can call this when it finds out that SurfaceManager
   // is no longer alive during destruction.
   void DidDestroySurfaceManager() { manager_ = nullptr; }
 
  private:
   FrameSinkId frame_sink_id_;
+  base::Optional<LocalFrameId> last_local_frame_id_;

[Fady Samuel, 2016/11/10 23:33:37]

Why is this optional? I don't think this needs to be a base::Optional.

[danakj, 2016/11/10 23:57:58]

Same, just have an empty/default id?

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

Done.

   SurfaceManager* manager_;
   SurfaceFactoryClient* client_;
   SurfaceResourceHolder holder_;
 
   bool needs_sync_points_;
+  void Create(const LocalFrameId& local_frame_id);
+  void Destroy(const LocalFrameId& local_frame_id);
+  void DestroyAll();
 
   using OwningSurfaceMap = std::
       unordered_map<LocalFrameId, std::unique_ptr<Surface>, LocalFrameIdHash>;
   OwningSurfaceMap surface_map_;
 
   base::WeakPtrFactory<SurfaceFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_FACTORY_H_