| Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| index 18a86a632b57b0ae4029cf2cbe2ef04e69d48dce..d4184fd704c7513c07365b86d21807dc35194cbb 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
|
| @@ -382,11 +382,9 @@ void ScrollableArea::contentsResized() {
|
| }
|
|
|
| bool ScrollableArea::hasOverlayScrollbars() const {
|
| - Scrollbar* vScrollbar = verticalScrollbar();
|
| - if (vScrollbar && vScrollbar->isOverlayScrollbar())
|
| - return true;
|
| - Scrollbar* hScrollbar = horizontalScrollbar();
|
| - return hScrollbar && hScrollbar->isOverlayScrollbar();
|
| + return (horizontalScrollbar() &&
|
| + horizontalScrollbar()->isOverlayScrollbar()) ||
|
| + (verticalScrollbar() && verticalScrollbar()->isOverlayScrollbar());
|
| }
|
|
|
| void ScrollableArea::setScrollbarOverlayColorTheme(
|
|
|