third_party/WebKit/Source/core/editing/commands/EditCommand.cpp - Issue 2393903003: [LayoutTest] Fix flakey test "inputevent-drag-drop.html"

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 2393903003: [LayoutTest] Fix flakey test "inputevent-drag-drop.html" (Closed)

Patch Set: Clear composition after merging with command wrapper Created 4 years, 2 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:

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 e2dcf9bb437ee106acce98a8c9690030bb037211..edd331acaec6f1a42234be86e8be348363c50f7e 100644

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

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

@@ -102,9 +102,7 @@ bool EditCommand::isRenderedCharacter(const Position& position) {

void EditCommand::setParent(CompositeEditCommand* parent) {

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

- DCHECK(!parent || parent->isCommandGroupWrapper() ||

chongz 2016/10/05 23:27:55 We don't need this anymore since the composition w

- !isCompositeEditCommand() ||

+ DCHECK(!parent || !isCompositeEditCommand() ||

!toCompositeEditCommand(this)->composition());

m_parent = parent;

if (parent) {