third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp - Issue 1679253002: Editing: Add EditingState* argument to EditCommand::doApply.

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

Issue 1679253002: Editing: Add EditingState* argument to EditCommand::doApply. (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/MergeIdenticalElementsCommand.h ('k') | third_party/WebKit/Source/core/editing/commands/MoveSelectionCommand.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 81f9c19f32e578a8f5837fce21d13b63040e1e4f..fbe0e469e29c4b129c88cfe4e0879bbfe58d7dad 100644

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

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

@@ -41,7 +41,7 @@ MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(PassRefPtrWillBeRaw

ASSERT(m_element1->nextSibling() == m_element2);

}

-void MergeIdenticalElementsCommand::doApply()

+void MergeIdenticalElementsCommand::doApply(EditingState*)

{

if (m_element1->nextSibling() != m_element2 || !m_element1->hasEditableStyle() || !m_element2->hasEditableStyle())

return;