Unify SurfaceInfo

content/renderer/child_frame_compositing_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/child_frame_compositing_helper.h"
 
 #include <utility>
 
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/picture_image_layer.h"
@@ skipping 191 matching lines @@
       crashed_layer->AddChild(sad_layer);
     }
   }
 
   std::unique_ptr<blink::WebLayer> layer(
       new cc_blink::WebLayerImpl(crashed_layer));
   UpdateWebLayer(std::move(layer));
 }
 
 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
   // scaledown the content when 2x frame data is added to 1x parent frame data.
   // 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(
       new cc_blink::WebLayerImpl(surface_layer));
   // TODO(lfg): Investigate if it's possible to propagate the information about
   // the child surface's opacity. https://crbug.com/629851.
   layer->setOpaque(false);
   layer->SetContentsOpaqueIsFixed(true);
   UpdateWebLayer(std::move(layer));
 
   UpdateVisibility(true);
 
   // The RWHV creates a destruction dependency on the surface that needs to be
   // satisfied. Note: render_frame_proxy_ is null in the case our client is a
   // BrowserPlugin; in this case the BrowserPlugin sends its own SatisfySequence
   // message.
   if (render_frame_proxy_) {
     render_frame_proxy_->Send(
         new FrameHostMsg_SatisfySequence(host_routing_id_, sequence));
   } else if (browser_plugin_.get()) {
     browser_plugin_->SendSatisfySequence(sequence);
   }
 
   CheckSizeAndAdjustLayerProperties(
-      frame_size, scale_factor,
+      surface_info.size_in_pixels(), surface_info.device_scale_factor(),
       static_cast<cc_blink::WebLayerImpl*>(web_layer_.get())->layer());
 }
 
 void ChildFrameCompositingHelper::UpdateVisibility(bool visible) {
   if (web_layer_)
     web_layer_->setDrawsContent(visible);
 }
 
 }  // namespace content