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>
@@ skipping 28 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,
   // although the frame may reference surfaces created by other factories.
   // The callback is called the first time this frame is used to draw, or if
   // the frame is discarded.
   void SubmitCompositorFrame(const LocalFrameId& local_frame_id,
                              CompositorFrame frame,
                              const DrawCallback& callback);
   void RequestCopyOfSurface(const LocalFrameId& local_frame_id,
                             std::unique_ptr<CopyOutputRequest> copy_request);
 
@@ skipping 11 matching lines @@
   // to have sync points set on them when returned from the Display, for
   // 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_;

[Fady Samuel, 2016/11/11 19:47:56]

nit make const.

+  LocalFrameId current_local_frame_id_;
   SurfaceManager* manager_;
   SurfaceFactoryClient* client_;
   SurfaceResourceHolder holder_;
 
   bool needs_sync_points_;
+  void Create(const LocalFrameId& local_frame_id);

[Fady Samuel, 2016/11/11 19:47:57]

nit: style, we usually put methods above class variables.

+  void Destroy(const LocalFrameId& local_frame_id);
+  void DestroyAll();

[Fady Samuel, 2016/11/11 19:47:57]

Rename DestroyAll() => EvictFrame() and make public.

+
+  // 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,

[Fady Samuel, 2016/11/11 19:47:57]

Try to make method order in the cc file match the order in the header file.

+                               const LocalFrameId& old_id);
 
   using OwningSurfaceMap = std::
       unordered_map<LocalFrameId, std::unique_ptr<Surface>, LocalFrameIdHash>;
   OwningSurfaceMap surface_map_;

[Fady Samuel, 2016/11/11 19:49:03]

Replace this with:

std::unique_ptr<Surface> active_surface_;

 
   base::WeakPtrFactory<SurfaceFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_FACTORY_H_