| Index: third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| index 8c7602249674c94b39bb668f96d90b18597e741f..c268359509d0b5907615e451d1d2c12e0e89389d 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp
|
| @@ -943,7 +943,7 @@ PassRefPtrWillBeRawPtr<HTMLElement> CompositeEditCommand::moveParagraphContentsT
|
| if (isEnclosingBlock(upstreamStart.anchorNode())) {
|
| // If the block is the root editable element, always move content to a new block,
|
| // since it is illegal to modify attributes on the root editable element for editing.
|
| - if (upstreamStart.anchorNode() == editableRootElementForPosition(upstreamStart)) {
|
| + if (upstreamStart.anchorNode() == rootEditableElementOf(upstreamStart)) {
|
| // If the block is the root editable element and it contains no visible content, create a new
|
| // block but don't try and move content into it, since there's nothing for moveParagraphs to move.
|
| if (!hasRenderedNonAnonymousDescendantsWithHeight(upstreamStart.anchorNode()->layoutObject()))
|
| @@ -1471,7 +1471,7 @@ Position CompositeEditCommand::positionAvoidingSpecialElementBoundary(const Posi
|
| }
|
| }
|
|
|
| - if (result.isNull() || !editableRootElementForPosition(result))
|
| + if (result.isNull() || !rootEditableElementOf(result))
|
| result = original;
|
|
|
| return result;
|
|
|