Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(655)

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Issue 2569013006: Changed EOverflow to an enum class and renamed its members (Closed)
Patch Set: Rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e50d441318e02d9e712f2b5845123466b39657b5..42bae0b72a85e2141f46a13709ba8223a6526927 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -606,8 +606,9 @@ bool PaintLayerScrollableArea::userInputScrollable(
EOverflow overflowStyle = (orientation == HorizontalScrollbar)
? box().style()->overflowX()
: box().style()->overflowY();
- return (overflowStyle == OverflowScroll || overflowStyle == OverflowAuto ||
- overflowStyle == OverflowOverlay);
+ return (overflowStyle == EOverflow::Scroll ||
+ overflowStyle == EOverflow::Auto ||
+ overflowStyle == EOverflow::Overlay);
}
bool PaintLayerScrollableArea::shouldPlaceVerticalScrollbarOnLeft() const {
@@ -734,9 +735,9 @@ void PaintLayerScrollableArea::updateAfterLayout() {
// Our proprietary overflow: overlay value doesn't trigger a layout.
if ((horizontalScrollbarShouldChange &&
- box().style()->overflowX() != OverflowOverlay) ||
+ box().style()->overflowX() != EOverflow::Overlay) ||
(verticalScrollbarShouldChange &&
- box().style()->overflowY() != OverflowOverlay)) {
+ box().style()->overflowY() != EOverflow::Overlay)) {
if ((verticalScrollbarShouldChange && box().isHorizontalWritingMode()) ||
(horizontalScrollbarShouldChange &&
!box().isHorizontalWritingMode())) {
@@ -955,14 +956,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() == OverflowScroll &&
- box().style()->overflowX() != OverflowScroll) {
+ oldStyle->overflowX() == EOverflow::Scroll &&
+ box().style()->overflowX() != EOverflow::Scroll) {
horizontalScrollbar()->setEnabled(true);
}
if (hasVerticalScrollbar() && oldStyle &&
- oldStyle->overflowY() == OverflowScroll &&
- box().style()->overflowY() != OverflowScroll) {
+ oldStyle->overflowY() == EOverflow::Scroll &&
+ box().style()->overflowY() != EOverflow::Scroll) {
verticalScrollbar()->setEnabled(true);
}
« no previous file with comments | « third_party/WebKit/Source/core/page/SpatialNavigation.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698