| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| index 8e915fe9217001f80e3026f43383a77d7b151ba8..8eef9f10843509642a26e3d269a9b514b57ba9c3 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| @@ -627,9 +627,9 @@ bool PaintLayerScrollableArea::userInputScrollable(
|
| EOverflow overflowStyle = (orientation == HorizontalScrollbar)
|
| ? box().style()->overflowX()
|
| : box().style()->overflowY();
|
| - return (overflowStyle == EOverflow::Scroll ||
|
| - overflowStyle == EOverflow::Auto ||
|
| - overflowStyle == EOverflow::Overlay);
|
| + return (overflowStyle == EOverflow::kScroll ||
|
| + overflowStyle == EOverflow::kAuto ||
|
| + overflowStyle == EOverflow::kOverlay);
|
| }
|
|
|
| bool PaintLayerScrollableArea::shouldPlaceVerticalScrollbarOnLeft() const {
|
| @@ -756,9 +756,9 @@ void PaintLayerScrollableArea::updateAfterLayout() {
|
|
|
| // Our proprietary overflow: overlay value doesn't trigger a layout.
|
| if ((horizontalScrollbarShouldChange &&
|
| - box().style()->overflowX() != EOverflow::Overlay) ||
|
| + box().style()->overflowX() != EOverflow::kOverlay) ||
|
| (verticalScrollbarShouldChange &&
|
| - box().style()->overflowY() != EOverflow::Overlay)) {
|
| + box().style()->overflowY() != EOverflow::kOverlay)) {
|
| if ((verticalScrollbarShouldChange && box().isHorizontalWritingMode()) ||
|
| (horizontalScrollbarShouldChange &&
|
| !box().isHorizontalWritingMode())) {
|
| @@ -981,14 +981,14 @@ void PaintLayerScrollableArea::updateAfterStyleChange(
|
| // With overflow: scroll, scrollbars are always visible but may be disabled.
|
| // When switching to another value, we need to re-enable them (see bug 11985).
|
| if (hasHorizontalScrollbar() && oldStyle &&
|
| - oldStyle->overflowX() == EOverflow::Scroll &&
|
| - box().style()->overflowX() != EOverflow::Scroll) {
|
| + oldStyle->overflowX() == EOverflow::kScroll &&
|
| + box().style()->overflowX() != EOverflow::kScroll) {
|
| horizontalScrollbar()->setEnabled(true);
|
| }
|
|
|
| if (hasVerticalScrollbar() && oldStyle &&
|
| - oldStyle->overflowY() == EOverflow::Scroll &&
|
| - box().style()->overflowY() != EOverflow::Scroll) {
|
| + oldStyle->overflowY() == EOverflow::kScroll &&
|
| + box().style()->overflowY() != EOverflow::kScroll) {
|
| verticalScrollbar()->setEnabled(true);
|
| }
|
|
|
|
|