Unify SurfaceInfo

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

 // Copyright 2016 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/browser/renderer_host/offscreen_canvas_surface_impl.h"
 
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/memory/ptr_util.h"
@@ skipping 27 matching lines @@
     blink::mojom::OffscreenCanvasSurfaceRequest request) {
   std::unique_ptr<OffscreenCanvasSurfaceImpl> impl =
       base::MakeUnique<OffscreenCanvasSurfaceImpl>(frame_sink_id,
                                                    std::move(client));
   OffscreenCanvasSurfaceImpl* surface_service = impl.get();
   surface_service->binding_ =
       mojo::MakeStrongBinding(std::move(impl), std::move(request));
 }
 
 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());
     }
   }
 }
 
 void OffscreenCanvasSurfaceImpl::Require(const cc::SurfaceId& surface_id,
                                          const cc::SurfaceSequence& sequence) {
   cc::SurfaceManager* manager = GetSurfaceManager();
   cc::Surface* surface = manager->GetSurfaceForId(surface_id);
   if (!surface) {
     DLOG(ERROR) << "Attempting to require callback on nonexistent surface";
     return;
   }
   surface->AddDestructionDependency(sequence);
 }
 
 void OffscreenCanvasSurfaceImpl::Satisfy(const cc::SurfaceSequence& sequence) {
   std::vector<uint32_t> sequences;
   sequences.push_back(sequence.sequence);
   cc::SurfaceManager* manager = GetSurfaceManager();
   manager->DidSatisfySequences(sequence.frame_sink_id, &sequences);
 }
 
 }  // namespace content