Remove dip scale dependency from ui::WindowAndroid

ui/snapshot/snapshot_android.cc

 // Copyright (c) 2012 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 "ui/snapshot/snapshot.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 31 matching lines @@
   std::unique_ptr<cc::CopyOutputRequest> request =
       cc::CopyOutputRequest::CreateBitmapRequest(callback);
 
   const display::Display& display =
       display::Screen::GetScreen()->GetPrimaryDisplay();
   float device_scale_factor = display.device_scale_factor();
   gfx::Rect source_rect_in_pixel =
       gfx::ScaleToEnclosingRect(source_rect, device_scale_factor);
 
   // Account for the toolbar offset.
-  gfx::Vector2dF offset = window->content_offset();
-  gfx::Rect adjusted_source_rect(gfx::ToRoundedPoint(
-      gfx::PointF(source_rect_in_pixel.x() + offset.x(),
-                  source_rect_in_pixel.y() + offset.y())),
+  gfx::Vector2dF offset_in_pixel =
+      gfx::ScaleVector2d(window->content_offset(), device_scale_factor);
+  gfx::Rect adjusted_source_rect(
+      gfx::ToRoundedPoint(
+          gfx::PointF(source_rect_in_pixel.x() + offset_in_pixel.x(),
+                      source_rect_in_pixel.y() + offset_in_pixel.y())),
       source_rect_in_pixel.size());
 
   request->set_area(adjusted_source_rect);
   window->GetCompositor()->RequestCopyOfOutputOnRootLayer(std::move(request));
 }
 
 void GrabWindowSnapshotAndScaleAsync(
     gfx::NativeWindow window,
     const gfx::Rect& source_rect,
     const gfx::Size& target_size,
@@ skipping 22 matching lines @@
 void GrabViewSnapshotAsync(
     gfx::NativeView view,
     const gfx::Rect& source_rect,
     scoped_refptr<base::TaskRunner> background_task_runner,
     const GrabWindowSnapshotAsyncPNGCallback& callback) {
   GrabWindowSnapshotAsync(
       view->GetWindowAndroid(), source_rect, background_task_runner, callback);
 }
 
 }  // namespace ui