Fix positioning of autofill popup on rtl

chrome/browser/ui/autofill/popup_controller_common.cc

 // Copyright 2014 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/popup_controller_common.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/screen.h"
 
 namespace autofill {
 
 PopupControllerCommon::PopupControllerCommon(
     const gfx::RectF& element_bounds,
+    base::i18n::TextDirection text_direction,
     const gfx::NativeView container_view,
     content::WebContents* web_contents)
     : element_bounds_(element_bounds),
+      text_direction_(text_direction),
       container_view_(container_view),
       web_contents_(web_contents),
-      key_press_event_target_(NULL) {}
+      key_press_event_target_(NULL) {
+}
 PopupControllerCommon::~PopupControllerCommon() {}
 
 void PopupControllerCommon::SetKeyPressCallback(
     content::RenderWidgetHost::KeyPressEventCallback callback) {
   DCHECK(key_press_event_callback_.is_null());
   key_press_event_callback_ = callback;
 }
 
 void PopupControllerCommon::RegisterKeyPressCallback() {
   if (web_contents_ && !key_press_event_target_) {
@@ skipping 38 matching lines @@
   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> grow_right(right_growth_start, popup_width);
+  std::pair<int, int> grow_left(left_growth_end - popup_width, popup_width);
+
+  // Prefer to grow towards the end (right for LTR, left for RTL). But if there
+  // is not enough space available in the desired direction and more space in
+  // the other direction, reverse it.
+  if (is_rtl()) {
+    return left_available >= popup_width || left_available >= right_available
+               ? grow_left
+               : grow_right;
+  }
+  return right_available >= popup_width || right_available >= left_available
+             ? grow_right
+             : grow_left;
 }
 
 std::pair<int,int> PopupControllerCommon::CalculatePopupYAndHeight(
     const gfx::Display& top_display,
     const gfx::Display& bottom_display,
     int popup_required_height) const {
   int topmost_display_y = top_display.bounds().y();
   int bottommost_display_y =
       bottom_display.GetSizeInPixel().height() + bottom_display.bounds().y();
 
@@ skipping 51 matching lines @@
                                bottom_right_display,
                                desired_height);
 
   return gfx::Rect(popup_x_and_width.first,
                    popup_y_and_height.first,
                    popup_x_and_width.second,
                    popup_y_and_height.second);
 }
 
 }  // namespace autofill