| Index: third_party/WebKit/Source/core/editing/VisibleUnits.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
|
| index 8abdcb4c98eaff5baac6ead9d0b929fd4ad0cf91..da37a9afc51c5ea18a5597531534c24a20698fc8 100644
|
| --- a/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/VisibleUnits.cpp
|
| @@ -365,10 +365,11 @@ static Position nextRootInlineBoxCandidatePosition(
|
| ContainerNode* highestRoot =
|
| highestEditableRoot(visiblePosition.deepEquivalent(), editableType);
|
| Node* nextNode = nextLeafWithSameEditability(node, editableType);
|
| - while (nextNode && (!nextNode->layoutObject() ||
|
| - inSameLine(createVisiblePosition(
|
| - firstPositionInOrBeforeNode(nextNode)),
|
| - visiblePosition)))
|
| + while (
|
| + nextNode &&
|
| + (!nextNode->layoutObject() ||
|
| + inSameLine(createVisiblePosition(firstPositionInOrBeforeNode(nextNode)),
|
| + visiblePosition)))
|
| nextNode = nextLeafWithSameEditability(nextNode, ContentIsEditable);
|
|
|
| while (nextNode && !nextNode->isShadowRoot()) {
|
| @@ -2343,8 +2344,9 @@ static InlineBoxPosition computeInlineBoxPositionTemplate(
|
| }
|
| if (layoutObject->isBox()) {
|
| inlineBox = toLayoutBox(layoutObject)->inlineBoxWrapper();
|
| - if (!inlineBox || (caretOffset > inlineBox->caretMinOffset() &&
|
| - caretOffset < inlineBox->caretMaxOffset()))
|
| + if (!inlineBox ||
|
| + (caretOffset > inlineBox->caretMinOffset() &&
|
| + caretOffset < inlineBox->caretMaxOffset()))
|
| return InlineBoxPosition(inlineBox, caretOffset);
|
| }
|
| } else {
|
| @@ -2748,9 +2750,10 @@ static bool inRenderedText(const PositionTemplate<Strategy>& position) {
|
| if (box->containsCaretOffset(textOffset)) {
|
| // Return false for offsets inside composed characters.
|
| return textOffset == 0 ||
|
| - textOffset == nextGraphemeBoundaryOf(anchorNode,
|
| - previousGraphemeBoundaryOf(
|
| - anchorNode, textOffset));
|
| + textOffset ==
|
| + nextGraphemeBoundaryOf(
|
| + anchorNode,
|
| + previousGraphemeBoundaryOf(anchorNode, textOffset));
|
| }
|
| }
|
|
|
|
|