Introducing SurfaceReferenceFactory

cc/layers/surface_layer_impl.cc

Index: cc/layers/surface_layer_impl.cc
diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc
index 2289a29326f449746f68eb7ddff19fd3a0ba58bf..b626ed8c2dd67eb3e2189fa9aecf022513d1f04f 100644
--- a/cc/layers/surface_layer_impl.cc
+++ b/cc/layers/surface_layer_impl.cc
@@ -16,7 +16,7 @@
 namespace cc {
 
 SurfaceLayerImpl::SurfaceLayerImpl(LayerTreeImpl* tree_impl, int id)
-    : LayerImpl(tree_impl, id), surface_scale_(0.f) {
+    : LayerImpl(tree_impl, id) {
   layer_tree_impl()->AddSurfaceLayer(this);
 }
 
@@ -29,27 +29,13 @@ std::unique_ptr<LayerImpl> SurfaceLayerImpl::CreateLayerImpl(
   return SurfaceLayerImpl::Create(tree_impl, id());
 }
 
-void SurfaceLayerImpl::SetSurfaceId(const SurfaceId& surface_id) {
-  if (surface_id_ == surface_id)
+void SurfaceLayerImpl::SetSurfaceInfo(SurfaceInfo surface_info) {
+  if (surface_info.id() == surface_info_.id() &&
+      surface_info.scale() == surface_info_.scale() &&
+      surface_info.size() == surface_info_.size()) {
     return;
-
-  surface_id_ = surface_id;
-  NoteLayerPropertyChanged();
-}
-
-void SurfaceLayerImpl::SetSurfaceScale(float scale) {
-  if (surface_scale_ == scale)
-    return;
-
-  surface_scale_ = scale;
-  NoteLayerPropertyChanged();
-}
-
-void SurfaceLayerImpl::SetSurfaceSize(const gfx::Size& size) {
-  if (surface_size_ == size)
-    return;
-
-  surface_size_ = size;
+  }
+  surface_info_ = surface_info;
   NoteLayerPropertyChanged();
 }
 
@@ -57,9 +43,7 @@ void SurfaceLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
   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 SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
@@ -68,12 +52,12 @@ void SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
 
   SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
-  PopulateScaledSharedQuadState(shared_quad_state, surface_scale_);
+  PopulateScaledSharedQuadState(shared_quad_state, surface_info_.scale());
 
-  if (!surface_id_.is_valid())
+  if (!surface_info_.id().is_valid())
     return;
 
-  gfx::Rect quad_rect(surface_size_);
+  gfx::Rect quad_rect(surface_info_.size());
   gfx::Rect visible_quad_rect =
       draw_properties().occlusion_in_content_space.GetUnoccludedContentRect(
           quad_rect);
@@ -81,7 +65,8 @@ void SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
     return;
   SurfaceDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
-  quad->SetNew(shared_quad_state, quad_rect, visible_quad_rect, surface_id_);
+  quad->SetNew(shared_quad_state, quad_rect, visible_quad_rect,
+               surface_info_.id());
 }
 
 void SurfaceLayerImpl::GetDebugBorderProperties(SkColor* color,
@@ -179,7 +164,7 @@ void SurfaceLayerImpl::AppendRainbowDebugBorder(RenderPass* render_pass) {
 
 void SurfaceLayerImpl::AsValueInto(base::trace_event::TracedValue* dict) const {
   LayerImpl::AsValueInto(dict);
-  dict->SetString("surface_id", surface_id_.ToString());
+  dict->SetString("surface_id", surface_info_.id().ToString());
 }
 
 const char* SurfaceLayerImpl::LayerTypeAsString() const {