| Index: Source/core/editing/ApplyStyleCommand.cpp
|
| diff --git a/Source/core/editing/ApplyStyleCommand.cpp b/Source/core/editing/ApplyStyleCommand.cpp
|
| index 1929775ec3b7519e5cef479c717fd7a6d3b77552..53ba1cd829e3c1590c636959a8d5b60405bba579 100644
|
| --- a/Source/core/editing/ApplyStyleCommand.cpp
|
| +++ b/Source/core/editing/ApplyStyleCommand.cpp
|
| @@ -1292,18 +1292,16 @@ bool ApplyStyleCommand::mergeStartWithPreviousIfIdentical(const Position& start,
|
| bool ApplyStyleCommand::mergeEndWithNextIfIdentical(const Position& start, const Position& end)
|
| {
|
| Node* endNode = end.containerNode();
|
| - int endOffset = end.computeOffsetInContainerNode();
|
|
|
| if (isAtomicNode(endNode)) {
|
| + int endOffset = end.computeOffsetInContainerNode();
|
| if (offsetIsBeforeLastNodeOffset(endOffset, endNode))
|
| return false;
|
|
|
| - unsigned parentLastOffset = end.deprecatedNode()->parentNode()->childNodes()->length() - 1;
|
| if (end.deprecatedNode()->nextSibling())
|
| return false;
|
|
|
| endNode = end.deprecatedNode()->parentNode();
|
| - endOffset = parentLastOffset;
|
| }
|
|
|
| if (!endNode->isElementNode() || endNode->hasTagName(brTag))
|
|
|