third_party/WebKit/Source/core/page/SpatialNavigation.cpp - Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase

Unified Diff: third_party/WebKit/Source/core/page/SpatialNavigation.cpp

Issue 1766723004: style: Remame values in EOverflow and EVerticalAlign to CamelCase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enum-clash-EOverflowEVerticalAlign: rebase Created 4 years, 9 months 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/page/SpatialNavigation.cpp

diff --git a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp

index f5a7792bbb4df19c4159dd522a1c2c47f71eab4a..78be6ff18cbbc8380d9d6c43e076144ffc5c5389 100644

--- a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp

+++ b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp

@@ -320,13 +320,13 @@ bool canScrollInDirection(const Node* container, WebFocusType type)

switch (type) {

case WebFocusTypeLeft:

- return (container->layoutObject()->style()->overflowX() != OHIDDEN && container->layoutBox()->scrollLeft() > 0);

+ return (container->layoutObject()->style()->overflowX() != OverflowHidden && container->layoutBox()->scrollLeft() > 0);

case WebFocusTypeUp:

- return (container->layoutObject()->style()->overflowY() != OHIDDEN && container->layoutBox()->scrollTop() > 0);

+ return (container->layoutObject()->style()->overflowY() != OverflowHidden && container->layoutBox()->scrollTop() > 0);

case WebFocusTypeRight:

- return (container->layoutObject()->style()->overflowX() != OHIDDEN && container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth() < container->layoutBox()->scrollWidth());

+ return (container->layoutObject()->style()->overflowX() != OverflowHidden && container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth() < container->layoutBox()->scrollWidth());

case WebFocusTypeDown:

- return (container->layoutObject()->style()->overflowY() != OHIDDEN && container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight() < container->layoutBox()->scrollHeight());

+ return (container->layoutObject()->style()->overflowY() != OverflowHidden && container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight() < container->layoutBox()->scrollHeight());

default:

ASSERT_NOT_REACHED();

return false;

@@ -584,8 +584,8 @@ bool canBeScrolledIntoView(WebFocusType type, const FocusCandidate& candidate)

for (Node* parentNode = candidate.visibleNode->parentNode(); parentNode; parentNode = parentNode->parentNode()) {

LayoutRect parentRect = nodeRectInAbsoluteCoordinates(parentNode);

if (!candidateRect.intersects(parentRect)) {

- if (((type == WebFocusTypeLeft || type == WebFocusTypeRight) && parentNode->layoutObject()->style()->overflowX() == OHIDDEN)

- || ((type == WebFocusTypeUp || type == WebFocusTypeDown) && parentNode->layoutObject()->style()->overflowY() == OHIDDEN))

+ if (((type == WebFocusTypeLeft || type == WebFocusTypeRight) && parentNode->layoutObject()->style()->overflowX() == OverflowHidden)

+ || ((type == WebFocusTypeUp || type == WebFocusTypeDown) && parentNode->layoutObject()->style()->overflowY() == OverflowHidden))

return false;

}

if (parentNode == candidate.enclosingScrollableBox)