diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 12:27:28 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-12 17:38:06 +0100 |
| commit | 6fc495ad78b1663298d1395115dc316eeb537036 (patch) | |
| tree | c62f9a1177bec2dbd5c47ca90b91cde129c37441 /Source/WebCore/editing | |
| parent | d7957e4817d6aa730d583fb56e2556bb4e626fb0 (diff) | |
| download | external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.zip external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.gz external_webkit-6fc495ad78b1663298d1395115dc316eeb537036.tar.bz2 | |
Cherry-pick WebKit change r85267 as a prerequisite for r92139
See http://trac.webkit.org/changeset/85267
Bug: 6329073
Change-Id: I7c46eab459647059890732214a9b953adef0a647
Diffstat (limited to 'Source/WebCore/editing')
| -rw-r--r-- | Source/WebCore/editing/ApplyStyleCommand.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/editing/ApplyStyleCommand.cpp b/Source/WebCore/editing/ApplyStyleCommand.cpp index c9649d0..4f1bc93 100644 --- a/Source/WebCore/editing/ApplyStyleCommand.cpp +++ b/Source/WebCore/editing/ApplyStyleCommand.cpp @@ -1316,8 +1316,10 @@ void ApplyStyleCommand::surroundNodeRangeWithElement(PassRefPtr<Node> passedStar RefPtr<Node> node = startNode; while (node) { RefPtr<Node> next = node->nextSibling(); - removeNode(node); - appendNode(node, element); + if (node->isContentEditable()) { + removeNode(node); + appendNode(node, element); + } if (node == endNode) break; node = next; |