| Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| index 3ef32f17b55f43ce3b675d5d7470db5f7b110407..5df5901e0a7575c5d1bcce98386f8c5ab9165539 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
|
| @@ -1218,8 +1218,9 @@ VisiblePosition visiblePositionAfterNode(Node& node) {
|
| }
|
|
|
| bool isHTMLListElement(Node* n) {
|
| - return (n && (isHTMLUListElement(*n) || isHTMLOListElement(*n) ||
|
| - isHTMLDListElement(*n)));
|
| + return (n &&
|
| + (isHTMLUListElement(*n) || isHTMLOListElement(*n) ||
|
| + isHTMLDListElement(*n)));
|
| }
|
|
|
| bool isListItem(const Node* n) {
|
| @@ -1469,8 +1470,9 @@ bool canMergeLists(Element* firstList, Element* secondList) {
|
| &&
|
| rootEditableElement(*firstList) ==
|
| rootEditableElement(*secondList) // don't cross editing boundaries
|
| - && isVisiblyAdjacent(Position::inParentAfterNode(*firstList),
|
| - Position::inParentBeforeNode(*secondList));
|
| + &&
|
| + isVisiblyAdjacent(Position::inParentAfterNode(*firstList),
|
| + Position::inParentBeforeNode(*secondList));
|
| // Make sure there is no visible content between this li and the previous list
|
| }
|
|
|
|
|