diff options
Diffstat (limited to 'Source/WebCore/editing/ApplyBlockElementCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/ApplyBlockElementCommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/editing/ApplyBlockElementCommand.cpp b/Source/WebCore/editing/ApplyBlockElementCommand.cpp index 7e20acc..c8f2161 100644 --- a/Source/WebCore/editing/ApplyBlockElementCommand.cpp +++ b/Source/WebCore/editing/ApplyBlockElementCommand.cpp @@ -72,7 +72,7 @@ void ApplyBlockElementCommand::doApply() // margin/padding, but not others. We should make the gap painting more consistent and // then use a left margin/padding rule here. if (visibleEnd != visibleStart && isStartOfParagraph(visibleEnd)) - setEndingSelection(VisibleSelection(visibleStart, visibleEnd.previous(true))); + setEndingSelection(VisibleSelection(visibleStart, visibleEnd.previous(CannotCrossEditingBoundary))); VisibleSelection selection = selectionForParagraphIteration(endingSelection()); VisiblePosition startOfSelection = selection.visibleStart(); @@ -193,7 +193,7 @@ void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const if (!startStyle->collapseWhiteSpace() && start.offsetInContainerNode() > 0) { int startOffset = start.offsetInContainerNode(); splitTextNode(static_cast<Text*>(start.deprecatedNode()), startOffset); - start = positionBeforeNode(start.deprecatedNode()); + start = firstPositionInOrBeforeNode(start.deprecatedNode()); if (isStartAndEndOnSameNode) { ASSERT(end.offsetInContainerNode() >= startOffset); end = Position(end.deprecatedNode(), end.offsetInContainerNode() - startOffset, Position::PositionIsOffsetInAnchor); @@ -224,7 +224,7 @@ void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const && end.offsetInContainerNode() < end.containerNode()->maxCharacterOffset()) { splitTextNode(static_cast<Text*>(end.deprecatedNode()), end.offsetInContainerNode()); if (isStartAndEndOnSameNode) - start = positionBeforeNode(end.deprecatedNode()->previousSibling()); + start = firstPositionInOrBeforeNode(end.deprecatedNode()->previousSibling()); if (isEndAndEndOfLastParagraphOnSameNode) { if (m_endOfLastParagraph.offsetInContainerNode() == end.offsetInContainerNode()) m_endOfLastParagraph = lastPositionInNode(end.deprecatedNode()->previousSibling()); |