Seems incorrect to se device_scale_factor in SetLocalSurfaceId.

content/renderer/android/synchronous_compositor_frame_sink.cc

 // Copyright 2013 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/android/synchronous_compositor_frame_sink.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 228 matching lines @@
   if (in_software_draw_) {
     // The frame we send to the client is actually just the metadata. Preserve
     // the |frame| for the software path below.
     submit_frame.metadata = frame.metadata.Clone();
 
     if (!root_local_surface_id_.is_valid()) {
       root_local_surface_id_ = local_surface_id_allocator_->GenerateId();
       child_local_surface_id_ = local_surface_id_allocator_->GenerateId();
     }
 
-    display_->SetLocalSurfaceId(root_local_surface_id_,
-                                frame.metadata.device_scale_factor);
+    display_->SetLocalSurfaceId(root_local_surface_id_);
+    display_->SetDeviceScaleFactor(frame.metadata.device_scale_factor);
 
     // The layer compositor should be giving a frame that covers the
     // |sw_viewport_for_current_draw_| but at 0,0.
     gfx::Size child_size = sw_viewport_for_current_draw_.size();
     DCHECK(gfx::Rect(child_size) == frame.render_pass_list.back()->output_rect);
 
     // Make a size that covers from 0,0 and includes the area coming from the
     // layer compositor.
     gfx::Size display_size(sw_viewport_for_current_draw_.right(),
                            sw_viewport_for_current_draw_.bottom());
@@ skipping 208 matching lines @@
     const cc::ReturnedResourceArray& resources) {
   DCHECK(resources.empty());
   client_->ReclaimResources(resources);
 }
 
 void SynchronousCompositorFrameSink::WillDrawSurface(
     const cc::LocalSurfaceId& local_surface_id,
     const gfx::Rect& damage_rect) {}
 
 }  // namespace content