Index: trunk/Source/web/PopupListBox.cpp |
=================================================================== |
--- trunk/Source/web/PopupListBox.cpp (revision 176308) |
+++ trunk/Source/web/PopupListBox.cpp (working copy) |
@@ -349,7 +349,7 @@ |
{ |
// Adjust coords for scrolled frame. |
IntRect r = intersection(rect, frameRect()); |
- int tx = x() - scrollX() + ((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar()) ? verticalScrollbar()->width() : 0); |
+ int tx = x() - scrollX() + ((shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar()) ? verticalScrollbar()->width() : 0); |
int ty = y() - scrollY(); |
r.move(-tx, -ty); |
@@ -596,7 +596,7 @@ |
// Invalidate in the window contents, as FramelessScrollView::invalidateRect |
// paints in the window coordinates. |
IntRect clipRect = contentsToWindow(getRowBounds(index)); |
- if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar()) |
+ if (shouldPlaceVerticalScrollbarOnLeft() && verticalScrollbar()) |
clipRect.move(verticalScrollbar()->width(), 0); |
invalidateRect(clipRect); |
} |
@@ -773,8 +773,7 @@ |
// Set our widget and scrollable contents sizes. |
int scrollbarWidth = 0; |
if (m_visibleRows < numItems()) { |
- if (!ScrollbarTheme::theme()->usesOverlayScrollbars()) |
- scrollbarWidth = ScrollbarTheme::theme()->scrollbarThickness(); |
+ scrollbarWidth = ScrollbarTheme::theme()->scrollbarThickness(); |
// Use minEndOfLinePadding when there is a scrollbar so that we use |
// as much as (lineEndPaddingWidth - minEndOfLinePadding) padding |