third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp - Issue 1695153002: Editing: Make the |EditingState*| argument of CompositeEditCommand::removeNode mandatory.

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/InsertParagraphSeparatorCommand.cpp

Issue 1695153002: Editing: Make the |EditingState*| argument of CompositeEditCommand::removeNode mandatory. (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

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

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

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

index a2297835be3c5ad5c4a9ad5a24dc6daa340f518d..36b5938050a400f2024d6bc9512c1ecb67a3d723 100644

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

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

@@ -148,7 +148,7 @@ PassRefPtrWillBeRawPtr<Element> InsertParagraphSeparatorCommand::cloneHierarchyU

return parent.release();

}

-void InsertParagraphSeparatorCommand::doApply(EditingState*)

+void InsertParagraphSeparatorCommand::doApply(EditingState* editingState)

{

if (!endingSelection().isNonOrphanedCaretOrRange())

return;

@@ -193,7 +193,7 @@ void InsertParagraphSeparatorCommand::doApply(EditingState*)

//---------------------------------------------------------------------

// Handle special case of typing return on an empty list item

- if (breakOutOfEmptyListItem())

+ if (breakOutOfEmptyListItem(editingState) || editingState->isAborted())

return;

//---------------------------------------------------------------------

@@ -410,7 +410,9 @@ void InsertParagraphSeparatorCommand::doApply(EditingState*)

}

- moveRemainingSiblingsToNewParent(n, blockToInsert.get(), blockToInsert);

+ moveRemainingSiblingsToNewParent(n, blockToInsert.get(), blockToInsert, editingState);

+ if (editingState->isAborted())

+ return;

}

// Handle whitespace that occurs after the split