Introducing SurfaceReferenceFactory

cc/layers/surface_layer.h

Index: cc/layers/surface_layer.h
diff --git a/cc/layers/surface_layer.h b/cc/layers/surface_layer.h
index a66257d1bd94f6096dee8d9a9a614f70ad0777c8..91705fb28f8efe93eca162b871ebce9ba7a785d4 100644
--- a/cc/layers/surface_layer.h
+++ b/cc/layers/surface_layer.h
@@ -9,6 +9,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -32,18 +33,17 @@ class CC_EXPORT SurfaceLayer : public Layer {
       const SatisfyCallback& satisfy_callback,
       const RequireCallback& require_callback);
 
-  void SetSurfaceId(const SurfaceId& surface_id,
-                    float scale,
-                    const gfx::Size& size);
+  void SetSurfaceInfo(SurfaceInfo surface_info);

[Fady Samuel, 2016/11/21 15:59:03]

void SetSurfaceInfo(std::unique_ptr<SurfaceInfo> surface_info)

If we want to make this thing polymorphic and move-only then just use a
unique_ptr.

 
   // Layer overrides.
   std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
   void SetLayerTreeHost(LayerTreeHost* host) override;
   void PushPropertiesTo(LayerImpl* layer) override;
 
-  SurfaceId surface_id() const { return surface_id_; }
-  const gfx::Size& surface_size() const { return surface_size_; }
-  float surface_scale() const { return surface_scale_; }
+  SurfaceInfo surface_info() { return surface_info_; }

[Fady Samuel, 2016/11/21 15:59:03]

This should be readonly.

const SurfaceInfo& surface_info() const { return surface_info_; }

+  SurfaceId surface_id() const { return surface_info_.id(); }
+  const gfx::Size& surface_size() const { return surface_info_.size(); }
+  float surface_scale() const { return surface_info_.scale(); }
 
   const SatisfyCallback& satisfy_callback() const { return satisfy_callback_; }
   const RequireCallback& require_callback() const { return require_callback_; }
@@ -58,9 +58,7 @@ class CC_EXPORT SurfaceLayer : public Layer {
   void CreateNewDestroySequence();
   void SatisfyDestroySequence();
 
-  SurfaceId surface_id_;
-  gfx::Size surface_size_;
-  float surface_scale_;
+  SurfaceInfo surface_info_;
   SurfaceSequence destroy_sequence_;
   SatisfyCallback satisfy_callback_;
   RequireCallback require_callback_;