Unify SurfaceInfo

content/renderer/child_frame_compositing_helper.cc

Index: content/renderer/child_frame_compositing_helper.cc
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index 3a6ec7c0f06434a695783d124a006a95500f86d4..dd1459cb9a1e4a96e1013232e03a57a74795adcd 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -209,11 +209,10 @@ void ChildFrameCompositingHelper::ChildFrameGone() {
 }
 
 void ChildFrameCompositingHelper::OnSetSurface(
-    const cc::SurfaceId& surface_id,
-    const gfx::Size& frame_size,
-    float scale_factor,
+    const cc::SurfaceInfo& surface_info,
     const cc::SurfaceSequence& sequence) {
-  surface_id_ = surface_id;
+  float scale_factor = surface_info.device_scale_factor();
+  surface_id_ = surface_info.id();
   scoped_refptr<cc::SurfaceLayer> surface_layer =
       cc::SurfaceLayer::Create(surface_reference_factory_);
   // TODO(oshima): This is a stopgap fix so that the compositor does not
@@ -221,8 +220,9 @@ void ChildFrameCompositingHelper::OnSetSurface(
   // Fix this in cc/.
   if (IsUseZoomForDSFEnabled())
     scale_factor = 1.0f;
-  cc::SurfaceInfo info(surface_id, scale_factor, frame_size);
-  surface_layer->SetSurfaceInfo(info,
+
+  surface_layer->SetSurfaceInfo(cc::SurfaceInfo(surface_info.id(), scale_factor,
+                                                surface_info.size_in_pixels()),
                                 false /* stretch_content_to_fill_bounds */);
   surface_layer->SetMasksToBounds(true);
   std::unique_ptr<cc_blink::WebLayerImpl> layer(
@@ -247,7 +247,7 @@ void ChildFrameCompositingHelper::OnSetSurface(
   }
 
   CheckSizeAndAdjustLayerProperties(
-      frame_size, scale_factor,
+      surface_info.size_in_pixels(), surface_info.device_scale_factor(),
       static_cast<cc_blink::WebLayerImpl*>(web_layer_.get())->layer());
 }