Seems incorrect to se device_scale_factor in SetLocalSurfaceId.

services/ui/ws/frame_generator.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 "services/ui/ws/frame_generator.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/containers/adapters.h"
@@ skipping 64 matching lines @@
   gfx::Size frame_size = last_submitted_frame_size_;
   if (!frame.render_pass_list.empty())
     frame_size = frame.render_pass_list.back()->output_rect.size();
 
   if (!local_surface_id_.is_valid() ||
       frame_size != last_submitted_frame_size_) {
     local_surface_id_ = id_allocator_.GenerateId();
     display_private_->ResizeDisplay(frame_size);
   }
 
-  display_private_->SetLocalSurfaceId(local_surface_id_, device_scale_factor_);
+  display_private_->SetLocalSurfaceId(local_surface_id_);
+  display_private_->SetDeviceScaleFactor(device_scale_factor_);
   compositor_frame_sink_->SubmitCompositorFrame(local_surface_id_,
                                                 std::move(frame));
   compositor_frame_sink_->SetNeedsBeginFrame(false);
   last_submitted_frame_size_ = frame_size;
 }
 
 void FrameGenerator::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   // Nothing to do here because FrameGenerator CompositorFrames don't reference
   // any resources.
@@ skipping 73 matching lines @@
   auto* quad = pass->CreateAndAppendDrawQuad<cc::SurfaceDrawQuad>();
   quad->SetAll(sqs, bounds_at_origin /* rect */, gfx::Rect() /* opaque_rect */,
                bounds_at_origin /* visible_rect */, true /* needs_blending*/,
                window_manager_surface_info_.id(),
                cc::SurfaceDrawQuadType::PRIMARY, nullptr);
 }
 
 }  // namespace ws
 
 }  // namespace ui