third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp - Issue 2171493003: [Editing][DOM][CodeHealth] Make Node::hasEditableStyle global functions.

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 2171493003: [Editing][DOM][CodeHealth] Make Node::hasEditableStyle global functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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/dom/Node.cpp ('K') | « third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp » ('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 809f89acb03ef616b6f5845faf40539840c152c9..3b1719d2494168b0c8f03f2816438a08c59b7c64 100644

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

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

@@ -43,7 +43,7 @@ MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(Element* first, Ele

void MergeIdenticalElementsCommand::doApply(EditingState*)

{

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

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

return;

m_atChild = m_element2->firstChild();

@@ -65,7 +65,7 @@ void MergeIdenticalElementsCommand::doUnapply()

Node* atChild = m_atChild.release();

ContainerNode* parent = m_element2->parentNode();

- if (!parent || !parent->hasEditableStyle())

+ if (!parent || !hasEditableStyle(*parent))

return;

TrackExceptionState exceptionState;