Index: trunk/Source/core/editing/ApplyBlockElementCommand.cpp |
=================================================================== |
--- trunk/Source/core/editing/ApplyBlockElementCommand.cpp (revision 190671) |
+++ trunk/Source/core/editing/ApplyBlockElementCommand.cpp (working copy) |
@@ -173,7 +173,7 @@ |
return textAtPosition[0] == '\n'; |
} |
-static const LayoutStyle* layoutStyleOfEnclosingTextNode(const Position& position) |
+static LayoutStyle* layoutStyleOfEnclosingTextNode(const Position& position) |
{ |
if (position.anchorType() != Position::PositionIsOffsetInAnchor || !position.containerNode() || !position.containerNode()->isTextNode()) |
return 0; |
@@ -188,7 +188,7 @@ |
document().updateRenderTreeIfNeeded(); |
bool isStartAndEndOnSameNode = false; |
- if (const LayoutStyle* startStyle = layoutStyleOfEnclosingTextNode(start)) { |
+ if (LayoutStyle* startStyle = layoutStyleOfEnclosingTextNode(start)) { |
isStartAndEndOnSameNode = layoutStyleOfEnclosingTextNode(end) && start.containerNode() == end.containerNode(); |
bool isStartAndEndOfLastParagraphOnSameNode = layoutStyleOfEnclosingTextNode(m_endOfLastParagraph) && start.containerNode() == m_endOfLastParagraph.containerNode(); |
@@ -215,7 +215,7 @@ |
document().updateRenderTreeIfNeeded(); |
- if (const LayoutStyle* endStyle = layoutStyleOfEnclosingTextNode(end)) { |
+ if (LayoutStyle* endStyle = layoutStyleOfEnclosingTextNode(end)) { |
bool isEndAndEndOfLastParagraphOnSameNode = layoutStyleOfEnclosingTextNode(m_endOfLastParagraph) && end.deprecatedNode() == m_endOfLastParagraph.deprecatedNode(); |
// Include \n at the end of line if we're at an empty paragraph |
if (endStyle->preserveNewline() && start == end && end.offsetInContainerNode() < end.containerNode()->maxCharacterOffset()) { |
@@ -247,7 +247,7 @@ |
{ |
VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next()); |
Position position = endOfNextParagraph.deepEquivalent(); |
- const LayoutStyle* style = layoutStyleOfEnclosingTextNode(position); |
+ LayoutStyle* style = layoutStyleOfEnclosingTextNode(position); |
if (!style) |
return endOfNextParagraph; |