third_party/WebKit/Source/core/editing/commands/EditCommand.cpp - Issue 2374743002: [InputEvent] Support |deleteByDrag|, |insertFromDrop| and fire in sequential order

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

Issue 2374743002: [InputEvent] Support |deleteByDrag|, |insertFromDrop| and fire in sequential order (Closed)

Patch Set: Created 4 years, 3 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/DeleteSelectionCommand.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.cpp » ('j') | third_party/WebKit/Source/core/page/DragController.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8ca374741da2815c1f830381cb91356aa97b4f5b..19ce48e48164d935ca99dc07412d4b65ab52a7c4 100644

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

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

@@ -112,7 +112,8 @@ bool EditCommand::isRenderedCharacter(const Position& position)

void EditCommand::setParent(CompositeEditCommand* parent)

{

DCHECK((parent && !m_parent) || (!parent && m_parent));

- DCHECK(!parent || !isCompositeEditCommand() || !toCompositeEditCommand(this)->composition());

+ // Only allow merging |InsertFromDrop| with previous |DeleteByDrag| after applied.

+ DCHECK(!parent || !isCompositeEditCommand() || inputType() == InputEvent::InputType::InsertFromDrop || !toCompositeEditCommand(this)->composition());

m_parent = parent;

if (parent) {

m_startingSelection = parent->m_endingSelection;