| 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 26702c84d2077bcd2a80d9ece1e646f213120524..c734580a2094c6e2f162db7aaae721195b3501e4 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/ApplyStyleCommand.cpp
|
| @@ -984,7 +984,7 @@ bool ApplyStyleCommand::removeInlineStyleFromElement(EditingStyle* style, HTMLEl
|
| {
|
| DCHECK(element);
|
|
|
| - if (!element->parentNode() || !element->parentNode()->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))
|
| + if (!element->parentNode() || !element->parentNode()->isContentEditable())
|
| return false;
|
|
|
| if (isStyledInlineElementToRemove(element)) {
|
| @@ -1476,7 +1476,7 @@ void ApplyStyleCommand::surroundNodeRangeWithElement(Node* passedStartNode, Node
|
|
|
| while (node) {
|
| Node* next = node->nextSibling();
|
| - if (node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)) {
|
| + if (node->isContentEditable()) {
|
| removeNode(node, editingState);
|
| if (editingState->isAborted())
|
| return;
|
|
|