[Autofill] Ignore device scale factor when computing the Autofill popup position.

chrome/browser/ui/autofill/autofill_popup_controller_impl.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 "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 589 matching lines @@
 gfx::Display AutofillPopupControllerImpl::GetDisplayNearestPoint(
     const gfx::Point& point) const {
   return gfx::Screen::GetScreenFor(container_view())->GetDisplayNearestPoint(
       point);
 }
 
 std::pair<int, int> AutofillPopupControllerImpl::CalculatePopupXAndWidth(
     const gfx::Display& left_display,
     const gfx::Display& right_display,
     int popup_required_width) const {
-  int leftmost_display_x = left_display.bounds().x() *
-      left_display.device_scale_factor();
-  int rightmost_display_x = right_display.GetSizeInPixel().width() +
-      right_display.bounds().x() * right_display.device_scale_factor();
+  int leftmost_display_x = left_display.bounds().x();
+  int rightmost_display_x =
+      right_display.GetSizeInPixel().width() + right_display.bounds().x();
 
   // Calculate the start coordinates for the popup if it is growing right or
   // the end position if it is growing to the left, capped to screen space.
   int right_growth_start = std::max(leftmost_display_x,
                                     std::min(rightmost_display_x,
                                              RoundedElementBounds().x()));
   int left_growth_end = std::max(leftmost_display_x,
                                    std::min(rightmost_display_x,
                                             RoundedElementBounds().right()));
 
   int right_available = rightmost_display_x - right_growth_start;
   int left_available = left_growth_end - leftmost_display_x;
 
   int popup_width = std::min(popup_required_width,
                              std::max(right_available, left_available));
 
   // If there is enough space for the popup on the right, show it there,
   // otherwise choose the larger size.
   if (right_available >= popup_width || right_available >= left_available)
     return std::make_pair(right_growth_start, popup_width);
   else
     return std::make_pair(left_growth_end - popup_width, popup_width);
 }
 
 std::pair<int,int> AutofillPopupControllerImpl::CalculatePopupYAndHeight(
     const gfx::Display& top_display,
     const gfx::Display& bottom_display,
     int popup_required_height) const {
-  int topmost_display_y = top_display.bounds().y() *
-      top_display.device_scale_factor();
-  int bottommost_display_y = bottom_display.GetSizeInPixel().height() +
-      (bottom_display.bounds().y() *
-       bottom_display.device_scale_factor());
+  int topmost_display_y = top_display.bounds().y();
+  int bottommost_display_y =
+      bottom_display.GetSizeInPixel().height() + bottom_display.bounds().y();
 
   // Calculate the start coordinates for the popup if it is growing down or
   // the end position if it is growing up, capped to screen space.
   int top_growth_end = std::max(topmost_display_y,
                                 std::min(bottommost_display_y,
                                          RoundedElementBounds().y()));
   int bottom_growth_start = std::max(topmost_display_y,
       std::min(bottommost_display_y, RoundedElementBounds().bottom()));
 
   int top_available = bottom_growth_start - topmost_display_y;
   int bottom_available = bottommost_display_y - top_growth_end;
 
   // TODO(csharp): Restrict the popup height to what is available.
   if (bottom_available >= popup_required_height ||
       bottom_available >= top_available) {
     // The popup can appear below the field.
     return std::make_pair(bottom_growth_start, popup_required_height);
   } else {
     // The popup must appear above the field.
     return std::make_pair(top_growth_end - popup_required_height,
                           popup_required_height);
   }
 }
 
 }  // namespace autofill