third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp - Issue 1690513002: Editing: Pass failure information of RemoveNodeCommand to ReplaceSelectionCommand.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

Issue 1690513002: Editing: Pass failure information of RemoveNodeCommand to ReplaceSelectionCommand. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/RemoveNodePreservingChildrenCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

index aa6415cfc4b807ea6d848c6654fd04253ece6c9c..9cadc76f0020658f3d8394c7f3d8fc40d9a9eeec 100644

--- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

+++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp

@@ -920,7 +920,7 @@ static inline HTMLElement* elementToSplitToAvoidPastingIntoInlineElementsWithSty

return toHTMLElement(highestEnclosingNodeOfType(insertionPos, isInlineHTMLElementWithStyle, CannotCrossEditingBoundary, containingBlock));

}

-void ReplaceSelectionCommand::doApply(EditingState*)

+void ReplaceSelectionCommand::doApply(EditingState* editingState)

{

const VisibleSelection selection = endingSelection();

ASSERT(selection.isCaretOrRange());

@@ -974,7 +974,9 @@ void ReplaceSelectionCommand::doApply(EditingState*)

bool mergeBlocksAfterDelete = startIsInsideMailBlockquote || isEndOfParagraph(visibleEnd) || isStartOfBlock(visibleStart);

// FIXME: We should only expand to include fully selected special elements if we are copying a

// selection and pasting it on top of itself.

- deleteSelection(ASSERT_NO_EDITING_ABORT, false, mergeBlocksAfterDelete, false);

+ deleteSelection(editingState, false, mergeBlocksAfterDelete, false);

+ if (editingState->isAborted())

+ return;

if (fragment.hasInterchangeNewlineAtStart()) {

VisiblePosition startAfterDelete = endingSelection().visibleStart();

if (isEndOfParagraph(startAfterDelete) && !isStartOfParagraph(startAfterDelete) && !isEndOfEditableOrNonEditableContent(startAfterDelete))