Introducing SurfaceReferenceFactory

cc/layers/surface_layer.cc

Index: cc/layers/surface_layer.cc
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index 0f8bd3380be1aa873bf5ed197dcafabad45a9c51..b79710241c85aa73cc9061d290e03948a89808ca 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -10,6 +10,7 @@
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_sequence_generator.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/swap_promise_manager.h"
@@ -51,8 +52,7 @@ scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
 
 SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
                            const RequireCallback& require_callback)
-    : surface_scale_(1.f),
-      satisfy_callback_(satisfy_callback),
+    : satisfy_callback_(satisfy_callback),
       require_callback_(require_callback) {}
 
 SurfaceLayer::~SurfaceLayer() {
@@ -60,13 +60,10 @@ SurfaceLayer::~SurfaceLayer() {
   DCHECK(!destroy_sequence_.is_valid());
 }
 
-void SurfaceLayer::SetSurfaceId(const SurfaceId& surface_id,
-                                float scale,
-                                const gfx::Size& size) {
+void SurfaceLayer::SetSurfaceInfo(SurfaceInfo surface_info) {
   SatisfyDestroySequence();
-  surface_id_ = surface_id;
-  surface_size_ = size;
-  surface_scale_ = scale;
+
+  surface_info_ = surface_info;
   CreateNewDestroySequence();
 
   UpdateDrawsContent(HasDrawableContent());
@@ -79,7 +76,7 @@ std::unique_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl(
 }
 
 bool SurfaceLayer::HasDrawableContent() const {
-  return surface_id_.is_valid() && Layer::HasDrawableContent();
+  return surface_info_.id().is_valid() && Layer::HasDrawableContent();
 }
 
 void SurfaceLayer::SetLayerTreeHost(LayerTreeHost* host) {
@@ -98,9 +95,7 @@ void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {
   TRACE_EVENT0("cc", "SurfaceLayer::PushPropertiesTo");
   SurfaceLayerImpl* layer_impl = static_cast<SurfaceLayerImpl*>(layer);
 
-  layer_impl->SetSurfaceId(surface_id_);
-  layer_impl->SetSurfaceSize(surface_size_);
-  layer_impl->SetSurfaceScale(surface_scale_);
+  layer_impl->SetSurfaceInfo(surface_info_);
 }
 
 void SurfaceLayer::CreateNewDestroySequence() {
@@ -109,7 +104,7 @@ void SurfaceLayer::CreateNewDestroySequence() {
     destroy_sequence_ = layer_tree_host()
                             ->GetSurfaceSequenceGenerator()
                             ->CreateSurfaceSequence();
-    require_callback_.Run(surface_id_, destroy_sequence_);
+    require_callback_.Run(surface_info_.id(), destroy_sequence_);
   }
 }