Introducing SurfaceReferenceFactory

cc/layers/surface_layer_impl.h

Index: cc/layers/surface_layer_impl.h
diff --git a/cc/layers/surface_layer_impl.h b/cc/layers/surface_layer_impl.h
index e5d4128bc161f7a7a2bc9f6e4c9ad391c21da183..9feac5796a0a86cc533ad6d7bc5d7877708e0542 100644
--- a/cc/layers/surface_layer_impl.h
+++ b/cc/layers/surface_layer_impl.h
@@ -12,6 +12,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_info.h"
 
 namespace cc {
 
@@ -23,10 +24,9 @@ class CC_EXPORT SurfaceLayerImpl : public LayerImpl {
   }
   ~SurfaceLayerImpl() override;
 
-  void SetSurfaceId(const SurfaceId& surface_id);
-  void SetSurfaceScale(float scale);
-  void SetSurfaceSize(const gfx::Size& size);
-  const SurfaceId& surface_id() const { return surface_id_; }
+  void SetSurfaceInfo(SurfaceInfo surface_info);
+  const SurfaceInfo& surface_info() const { return surface_info_; }
+  const SurfaceId& surface_id() const { return surface_info().id(); }
 
   // LayerImpl overrides.
   std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
@@ -43,9 +43,7 @@ class CC_EXPORT SurfaceLayerImpl : public LayerImpl {
   void AsValueInto(base::trace_event::TracedValue* dict) const override;
   const char* LayerTypeAsString() const override;
 
-  SurfaceId surface_id_;
-  gfx::Size surface_size_;
-  float surface_scale_;
+  SurfaceInfo surface_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceLayerImpl);
 };