third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp - Issue 2121313003: [Editing][DOM][CodeHealth] Make Node::isContentEditable and Node::isRichEditable 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/RemoveNodeCommand.cpp

Issue 2121313003: [Editing][DOM][CodeHealth] Make Node::isContentEditable and Node::isRichEditable global functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/commands/InsertNodeBeforeCommand.cpp ('k') | third_party/WebKit/Source/core/html/HTMLElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 34cf6bebbaa3cd86f4245bc411c4cb40ce991522..489875809c62a8acf0e434fec113656f2f913a1c 100644

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

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

@@ -45,9 +45,9 @@ void RemoveNodeCommand::doApply(EditingState* editingState)

{

ContainerNode* parent = m_node->parentNode();

if (!parent || (m_shouldAssumeContentIsAlwaysEditable == DoNotAssumeContentIsAlwaysEditable

- && !parent->isContentEditable() && parent->inActiveDocument()))

+ && !isContentEditable(*parent) && parent->inActiveDocument()))

return;

- DCHECK(parent->isContentEditable() || !parent->inActiveDocument()) << parent;

+ DCHECK(isContentEditable(*parent) || !parent->inActiveDocument()) << parent;

m_parent = parent;

m_refChild = m_node->nextSibling();