Unify SurfaceInfo

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
index a4a88ac432c1fc51d0d705e72bf348348063c833..30144bf6da3c49578acb2fc985452ba208ac9cba 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
@@ -45,16 +45,16 @@ void OffscreenCanvasSurfaceImpl::Create(
 }
 
 void OffscreenCanvasSurfaceImpl::OnSurfaceCreated(
-    const cc::SurfaceId& surface_id,
-    const gfx::Size& frame_size,
-    float device_scale_factor) {
-  DCHECK_EQ(surface_id.frame_sink_id(), frame_sink_id_);
+    const cc::SurfaceInfo& surface_info) {
+  DCHECK_EQ(surface_info.id().frame_sink_id(), frame_sink_id_);
   if (!current_local_frame_id_.is_valid() ||
-      surface_id.local_frame_id() != current_local_frame_id_) {
-    current_local_frame_id_ = surface_id.local_frame_id();
+      surface_info.id().local_frame_id() != current_local_frame_id_) {
+    current_local_frame_id_ = surface_info.id().local_frame_id();
     if (client_) {
-      client_->OnSurfaceCreated(surface_id, frame_size.width(),
-                                frame_size.height(), device_scale_factor);
+      client_->OnSurfaceCreated(surface_info.id(),
+                                surface_info.size_in_pixels().width(),
+                                surface_info.size_in_pixels().height(),
+                                surface_info.device_scale_factor());
     }
   }
 }