third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp - Issue 1703903002: Editing: Remove unreasonable ASSERT_NO_EDITING_ABORT instances.

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 1703903002: Editing: Remove unreasonable ASSERT_NO_EDITING_ABORT instances. (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/EditingState.h ('k') | third_party/WebKit/Source/core/editing/commands/SimplifyMarkupCommand.h » ('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 e2f6543ff8d6bc48638669c042dd5b2d649d2faf..6b2719db78b475ded8440ee1b1467a9158ecbc45 100644

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

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

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

// Adjust the insertion position after the delete

const Position originalInsertionPosition = insertionPosition;

const Element* enclosingAnchor = enclosingAnchorElement(originalInsertionPosition);

- insertionPosition = positionAvoidingSpecialElementBoundary(insertionPosition, ASSERT_NO_EDITING_ABORT);

+ insertionPosition = positionAvoidingSpecialElementBoundary(insertionPosition, editingState);

+ if (editingState->isAborted())

+ return;

if (listChild == enclosingAnchor) {

// |positionAvoidingSpecialElementBoundary()| creates new A element and

// move to another place.

@@ -329,7 +331,10 @@ void InsertParagraphSeparatorCommand::doApply(EditingState* editingState)

// Recreate the same structure in the new paragraph.

WillBeHeapVector<RefPtrWillBeMember<Element>> ancestors;

- getAncestorsInsideBlock(positionAvoidingSpecialElementBoundary(positionOutsideTabSpan(insertionPosition), ASSERT_NO_EDITING_ABORT).anchorNode(), startBlock.get(), ancestors);

+ insertionPosition = positionAvoidingSpecialElementBoundary(positionOutsideTabSpan(insertionPosition), editingState);

+ if (editingState->isAborted())

+ return;

+ getAncestorsInsideBlock(insertionPosition.anchorNode(), startBlock.get(), ancestors);

RefPtrWillBeRawPtr<Element> placeholder = cloneHierarchyUnderNewBlock(ancestors, blockToInsert, editingState);

if (editingState->isAborted())