Enforce constant size and device scale factor for surfaces

cc/surfaces/surface_factory.cc

Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 7d65ec2ecff77a1f99cf1ad965eb3fe33b9292e9..533302f9b9ba9aa44f6fae4ae6a5773bd48ce0ff 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -58,6 +58,13 @@ void SurfaceFactory::SubmitCompositorFrame(
     }
   }
 
+  SurfaceId surface_id(frame_sink_id_, local_surface_id);
+  gfx::Size frame_size;
+  if (!frame.render_pass_list.empty())
+    frame_size = frame.render_pass_list.back()->output_rect.size();
+  float device_scale_factor = frame.metadata.device_scale_factor;
+  SurfaceInfo surface_info(surface_id, device_scale_factor, frame_size);
+
   std::unique_ptr<Surface> surface;
   bool create_new_surface =
       (!current_surface_ ||
@@ -65,7 +72,7 @@ void SurfaceFactory::SubmitCompositorFrame(
   if (!create_new_surface) {
     surface = std::move(current_surface_);
   } else {
-    surface = Create(local_surface_id);
+    surface = Create(surface_info);
   }
   surface->QueueFrame(std::move(frame), callback, will_draw_callback);
 
@@ -134,10 +141,10 @@ void SurfaceFactory::OnSurfaceDependenciesChanged(
 void SurfaceFactory::OnSurfaceDiscarded(Surface* surface) {}
 
 std::unique_ptr<Surface> SurfaceFactory::Create(
-    const LocalSurfaceId& local_surface_id) {
+    const SurfaceInfo& surface_info) {
   seen_first_frame_activation_ = false;
   std::unique_ptr<Surface> surface =
-      manager_->CreateSurface(weak_factory_.GetWeakPtr(), local_surface_id);
+      manager_->CreateSurface(weak_factory_.GetWeakPtr(), surface_info);
   surface->AddObserver(this);
   return surface;
 }