Introducing SurfaceReferenceFactory

ui/compositor/layer.cc

Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 03c6301c4903bcc8bb8f18f21d97f9955d1a215d..8f582fc2d91b23c8c4aedc8074d7064ddcfd833f 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -24,6 +24,7 @@
 #include "cc/output/filter_operations.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/resources/transferable_resource.h"
+#include "cc/surfaces/surface_info.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/dip_util.h"
@@ -183,12 +184,8 @@ std::unique_ptr<Layer> Layer::Clone() const {
   // cc::Layer state.
   if (surface_layer_ && surface_layer_->surface_id().is_valid()) {
     clone->SetShowSurface(
-        surface_layer_->surface_id(),
-        surface_layer_->satisfy_callback(),
-        surface_layer_->require_callback(),
-        surface_layer_->surface_size(),
-        surface_layer_->surface_scale(),
-        frame_size_in_dip_);
+        surface_layer_->surface_info(), surface_layer_->satisfy_callback(),
+        surface_layer_->require_callback(), frame_size_in_dip_);
   } else if (type_ == LAYER_SOLID_COLOR) {
     clone->SetColor(GetTargetColor());
   }
@@ -658,17 +655,15 @@ bool Layer::TextureFlipped() const {
 }
 
 void Layer::SetShowSurface(
-    const cc::SurfaceId& surface_id,
+    const cc::SurfaceInfo& surface_info,
     const cc::SurfaceLayer::SatisfyCallback& satisfy_callback,
     const cc::SurfaceLayer::RequireCallback& require_callback,
-    gfx::Size surface_size,
-    float scale,
     gfx::Size frame_size_in_dip) {
   DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR);
 
   scoped_refptr<cc::SurfaceLayer> new_layer =
       cc::SurfaceLayer::Create(satisfy_callback, require_callback);
-  new_layer->SetSurfaceId(surface_id, scale, surface_size);
+  new_layer->SetSurfaceInfo(surface_info);
   SwitchToLayer(new_layer);
   surface_layer_ = new_layer;
 
@@ -676,9 +671,8 @@ void Layer::SetShowSurface(
   RecomputeDrawsContentAndUVRect();
 
   for (const auto& mirror : mirrors_) {
-    mirror->dest()->SetShowSurface(
-        surface_id, satisfy_callback, require_callback,
-        surface_size, scale, frame_size_in_dip);
+    mirror->dest()->SetShowSurface(surface_info, satisfy_callback,
+                                   require_callback, frame_size_in_dip);
   }
 }