Fix rtl text shifting in PopupListBox

Source/web/PopupListBox.cpp

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 709 matching lines @@
 
     layout();
 }
 
 void PopupListBox::setMaxWidthAndLayout(int maxWidth)
 {
     m_maxWindowWidth = maxWidth;
     layout();
 }
 
+int PopupListBox::getRowBaseWidth(int index)
+{
+    Font font = getRowFont(index);
+    PopupMenuStyle style = m_popupClient->itemStyle(index);
+    String text = m_popupClient->itemText(index);
+    if (text.isEmpty())
+        return 0;
+    TextRun textRun(text, 0, 0, TextRun::AllowTrailingExpansion, style.textDirection(), style.hasTextDirectionOverride());
+    return font.width(textRun);
+}
+
 void PopupListBox::layout()
 {
     bool isRightAligned = m_popupClient->menuStyle().textDirection() == RTL;
 
     // Size our child items.
     int baseWidth = 0;
     int paddingWidth = 0;
     int lineEndPaddingWidth = 0;
     int y = 0;
     for (int i = 0; i < numItems(); ++i) {
         // Place the item vertically.
         m_items[i]->yOffset = y;
         if (m_popupClient->itemStyle(i).isDisplayNone())
             continue;
         y += getRowHeight(i);
 
         // Ensure the popup is wide enough to fit this item.
-        Font itemFont = getRowFont(i);
-        String text = m_popupClient->itemText(i);
-        int width = 0;
-        if (!text.isEmpty())
-            width = itemFont.width(TextRun(text));
-
-        baseWidth = max(baseWidth, width);
+        baseWidth = max(baseWidth, getRowBaseWidth(i));
         // FIXME: http://b/1210481 We should get the padding of individual
         // option elements.
         paddingWidth = max<int>(paddingWidth,
             m_popupClient->clientPaddingLeft() + m_popupClient->clientPaddingRight());
         lineEndPaddingWidth = max<int>(lineEndPaddingWidth,
             isRightAligned ? m_popupClient->clientPaddingLeft() : m_popupClient->clientPaddingRight());
     }
 
     // Calculate scroll bar width.
     int windowHeight = 0;
@@ skipping 60 matching lines @@
 {
     return numItems() && IntRect(0, 0, width(), height()).contains(point);
 }
 
 int PopupListBox::popupContentHeight() const
 {
     return height();
 }
 
 } // namespace blink