third_party/WebKit/Source/core/editing/commands/RemoveNodeCommand.cpp - Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink

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 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)

Patch Set: Created 3 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/InsertParagraphSeparatorCommand.cpp ('k') | third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp » ('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 6697d33939965e8bd960ac60bf6a2b3fa5fa9038..f4592ff7f76e5cfa61ee5d9fc4ff56a2dfb9ea4f 100644

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

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

@@ -47,9 +47,10 @@ RemoveNodeCommand::RemoveNodeCommand(

void RemoveNodeCommand::doApply(EditingState* editingState) {

ContainerNode* parent = m_node->parentNode();

document().updateStyleAndLayoutTree();

- if (!parent || (m_shouldAssumeContentIsAlwaysEditable ==

- DoNotAssumeContentIsAlwaysEditable &&

- !hasEditableStyle(*parent) && parent->inActiveDocument()))

+ if (!parent ||

+ (m_shouldAssumeContentIsAlwaysEditable ==

+ DoNotAssumeContentIsAlwaysEditable &&

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

return;

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