Index: Source/core/editing/FormatBlockCommand.cpp |
diff --git a/Source/core/editing/FormatBlockCommand.cpp b/Source/core/editing/FormatBlockCommand.cpp |
index 8ea2e4d608d120a29ac09e5430c26c0792bf0e99..8f49839357156e8969474632819bea2dc1f3ebc0 100644 |
--- a/Source/core/editing/FormatBlockCommand.cpp |
+++ b/Source/core/editing/FormatBlockCommand.cpp |
@@ -60,16 +60,17 @@ void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection |
void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtr<Element>& blockNode) |
{ |
- Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode()); |
- RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo); |
- RefPtr<Node> nodeAfterInsertionPosition = outerBlock; |
- |
- RefPtr<Range> range = Range::create(document(), start, endOfSelection); |
Element* refNode = enclosingBlockFlowElement(end); |
Element* root = editableRootForPosition(start); |
// Root is null for elements with contenteditable=false. |
if (!root || !refNode) |
return; |
+ |
+ Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode()); |
+ RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo); |
+ RefPtr<Node> nodeAfterInsertionPosition = outerBlock; |
+ RefPtr<Range> range = Range::create(document(), start, endOfSelection); |
+ |
if (isElementForFormatBlock(refNode->tagQName()) && start == startOfBlock(start) |
&& (end == endOfBlock(end) || isNodeVisiblyContainedWithin(refNode, range.get())) |
&& refNode != root && !root->isDescendantOf(refNode)) { |