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

Unified Diff: Source/core/editing/ApplyStyleCommand.cpp

Issue 182053002: Have Node::highestAncestor() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reupload Created 6 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 | « Source/core/dom/Node.h ('k') | Source/core/html/FormAssociatedElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/ApplyStyleCommand.cpp
diff --git a/Source/core/editing/ApplyStyleCommand.cpp b/Source/core/editing/ApplyStyleCommand.cpp
index d809696167311c30dd9454cb1e7c5325a58bf18d..966eea4a23de22c26d4cc6a017be3c59dd033627 100644
--- a/Source/core/editing/ApplyStyleCommand.cpp
+++ b/Source/core/editing/ApplyStyleCommand.cpp
@@ -253,9 +253,9 @@ void ApplyStyleCommand::applyBlockStyle(EditingStyle *style)
// Save and restore the selection endpoints using their indices in the document, since
// addBlockStyleIfNeeded may moveParagraphs, which can remove these endpoints.
// Calculate start and end indices from the start of the tree that they're in.
- Node* scope = visibleStart.deepEquivalent().deprecatedNode()->highestAncestor();
- RefPtr<Range> startRange = Range::create(document(), firstPositionInNode(scope), visibleStart.deepEquivalent().parentAnchoredEquivalent());
- RefPtr<Range> endRange = Range::create(document(), firstPositionInNode(scope), visibleEnd.deepEquivalent().parentAnchoredEquivalent());
+ Node& scope = visibleStart.deepEquivalent().deprecatedNode()->highestAncestor();
+ RefPtr<Range> startRange = Range::create(document(), firstPositionInNode(&scope), visibleStart.deepEquivalent().parentAnchoredEquivalent());
+ RefPtr<Range> endRange = Range::create(document(), firstPositionInNode(&scope), visibleEnd.deepEquivalent().parentAnchoredEquivalent());
int startIndex = TextIterator::rangeLength(startRange.get(), true);
int endIndex = TextIterator::rangeLength(endRange.get(), true);
@@ -286,8 +286,8 @@ void ApplyStyleCommand::applyBlockStyle(EditingStyle *style)
nextParagraphStart = endOfParagraph(paragraphStart).next();
}
- startRange = PlainTextRange(startIndex).createRangeForSelection(*toContainerNode(scope));
- endRange = PlainTextRange(endIndex).createRangeForSelection(*toContainerNode(scope));
+ startRange = PlainTextRange(startIndex).createRangeForSelection(toContainerNode(scope));
+ endRange = PlainTextRange(endIndex).createRangeForSelection(toContainerNode(scope));
if (startRange && endRange)
updateStartEnd(startRange->startPosition(), endRange->startPosition());
}
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/html/FormAssociatedElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698