Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2670)

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: Yosin's review 2 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:
View side-by-side diff with in-line comments
Download patch
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 edd331acaec6f1a42234be86e8be348363c50f7e..e2dcf9bb437ee106acce98a8c9690030bb037211 100644
--- a/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/EditCommand.cpp
@@ -102,7 +102,9 @@ bool EditCommand::isRenderedCharacter(const Position& position) {
void EditCommand::setParent(CompositeEditCommand* parent) {
DCHECK((parent && !m_parent) || (!parent && m_parent));
- DCHECK(!parent || !isCompositeEditCommand() ||
+ // Currently only allow merging |InsertFromDrop| and |DeleteByDrag| with |DragAndDropCommand| after applied.
+ DCHECK(!parent || parent->isCommandGroupWrapper() ||
+ !isCompositeEditCommand() ||
!toCompositeEditCommand(this)->composition());
m_parent = parent;
if (parent) {

Powered by Google App Engine
This is Rietveld 408576698