| Index: third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| index 040fda0fad899edbaf0a99b19afff8920cc74c28..ca4cda276556fbf28fb566a7c2cfafa7f4e08217 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| @@ -521,8 +521,9 @@ void ApplyStyleCommand::applyRelativeFontStyleChange(
|
| }
|
|
|
| static ContainerNode* dummySpanAncestorForNode(const Node* node) {
|
| - while (node && (!node->isElementNode() ||
|
| - !isStyleSpanOrSpanWithOnlyStyleAttribute(toElement(node))))
|
| + while (node &&
|
| + (!node->isElementNode() ||
|
| + !isStyleSpanOrSpanWithOnlyStyleAttribute(toElement(node))))
|
| node = node->parentNode();
|
|
|
| return node ? node->parentNode() : 0;
|
| @@ -1192,8 +1193,9 @@ bool ApplyStyleCommand::removeImplicitlyStyledElement(
|
| // with other styles
|
| Vector<QualifiedName> attributes;
|
| if (!style->extractConflictingImplicitStyleOfAttributes(
|
| - element, extractedStyle ? EditingStyle::PreserveWritingDirection
|
| - : EditingStyle::DoNotPreserveWritingDirection,
|
| + element,
|
| + extractedStyle ? EditingStyle::PreserveWritingDirection
|
| + : EditingStyle::DoNotPreserveWritingDirection,
|
| extractedStyle, attributes,
|
| mode == RemoveAlways ? EditingStyle::ExtractMatchingStyle
|
| : EditingStyle::DoNotExtractMatchingStyle))
|
| @@ -1796,8 +1798,9 @@ void ApplyStyleCommand::addInlineStyleIfNeeded(EditingStyle* style,
|
|
|
| Node* start = passedStart;
|
| Member<HTMLSpanElement> dummyElement = nullptr;
|
| - StyleChange styleChange(style, positionToComputeInlineStyleChange(
|
| - start, dummyElement, editingState));
|
| + StyleChange styleChange(
|
| + style,
|
| + positionToComputeInlineStyleChange(start, dummyElement, editingState));
|
| if (editingState->isAborted())
|
| return;
|
|
|
|
|