Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Unified Diff: trunk/Source/core/editing/ApplyBlockElementCommand.cpp

Issue 948053002: Revert 190605 "Make RenderObject::style() return a const object" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/Source/core/dom/TreeScope.cpp ('k') | trunk/Source/core/editing/EditorCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « trunk/Source/core/dom/TreeScope.cpp ('k') | trunk/Source/core/editing/EditorCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698