Reland 176261: Fix for select PopupMenuList appearance in rtl mode with overlay-scrollbar enabled.

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 331 matching lines @@
             selectIndex(index);
             return;
         }
     }
 }
 
 void PopupListBox::paint(GraphicsContext* gc, const IntRect& rect)
 {
     // Adjust coords for scrolled frame.
     IntRect r = intersection(rect, frameRect());
-    int tx = x() - scrollX() + ((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar()) ? verticalScrollbar()->width() : 0);
+    int tx = x() - scrollX() + ((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar()) ? verticalScrollbar()->width() : 0);
     int ty = y() - scrollY();
 
     r.move(-tx, -ty);
 
     // Set clip rect to match revised damage rect.
     gc->save();
     gc->translate(static_cast<float>(tx), static_cast<float>(ty));
     gc->clip(r);
 
     // FIXME: Can we optimize scrolling to not require repainting the entire
@@ skipping 226 matching lines @@
 }
 
 void PopupListBox::invalidateRow(int index)
 {
     if (index < 0)
         return;
 
     // Invalidate in the window contents, as FramelessScrollView::invalidateRect
     // paints in the window coordinates.
     IntRect clipRect = contentsToWindow(getRowBounds(index));
-    if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar())
+    if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar())
         clipRect.move(verticalScrollbar()->width(), 0);
     invalidateRect(clipRect);
 }
 
 void PopupListBox::scrollToRevealRow(int index)
 {
     if (index < 0)
         return;
 
     IntRect rowRect = getRowBounds(index);
@@ skipping 156 matching lines @@
             m_visibleRows = i;
             break;
         }
 
         windowHeight += rowHeight;
     }
 
     // Set our widget and scrollable contents sizes.
     int scrollbarWidth = 0;
     if (m_visibleRows < numItems()) {
-        scrollbarWidth = ScrollbarTheme::theme()->scrollbarThickness();
+        if (!ScrollbarTheme::theme()->usesOverlayScrollbars())
+            scrollbarWidth = ScrollbarTheme::theme()->scrollbarThickness();
 
         // Use minEndOfLinePadding when there is a scrollbar so that we use
         // as much as (lineEndPaddingWidth - minEndOfLinePadding) padding
         // space for scrollbar and allow user to use CSS padding to make the
         // popup listbox align with the select element.
         paddingWidth = paddingWidth - lineEndPaddingWidth + minEndOfLinePadding;
     }
 
     int windowWidth = baseWidth + scrollbarWidth + paddingWidth;
     if (windowWidth > m_maxWindowWidth) {
@@ skipping 31 matching lines @@
 {
     return numItems() && IntRect(0, 0, width(), height()).contains(point);
 }
 
 int PopupListBox::popupContentHeight() const
 {
     return height();
 }
 
 } // namespace blink