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

Unified Diff: Source/core/dom/DocumentMarkerController.cpp

Issue 560333002: Avoid more temporary ranges in connection with various TextIterators. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix mac build. Created 6 years, 3 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/accessibility/AXRenderObject.cpp ('k') | Source/core/dom/Range.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/DocumentMarkerController.cpp
diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp
index c710a8bcea2e4100e2d771fc2686c5d9d78ce49b..354d82a857fc1499f6d60a36896db5202f0f5dd0 100644
--- a/Source/core/dom/DocumentMarkerController.cpp
+++ b/Source/core/dom/DocumentMarkerController.cpp
@@ -98,8 +98,7 @@ void DocumentMarkerController::addMarker(Range* range, DocumentMarker::MarkerTyp
{
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
- RefPtrWillBeRawPtr<Range> textPiece = markedText.range();
- addMarker(textPiece->startContainer(), DocumentMarker(type, textPiece->startOffset(), textPiece->endOffset(), description, hash));
+ addMarker(markedText.startContainer(), DocumentMarker(type, markedText.startOffset(), markedText.endOffset(), description, hash));
}
}
@@ -107,8 +106,7 @@ void DocumentMarkerController::addMarker(Range* range, DocumentMarker::MarkerTyp
{
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
- RefPtrWillBeRawPtr<Range> textPiece = markedText.range();
- addMarker(textPiece->startContainer(), DocumentMarker(type, textPiece->startOffset(), textPiece->endOffset(), description));
+ addMarker(markedText.startContainer(), DocumentMarker(type, markedText.startOffset(), markedText.endOffset(), description));
}
}
@@ -116,8 +114,7 @@ void DocumentMarkerController::addMarker(Range* range, DocumentMarker::MarkerTyp
{
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
- RefPtrWillBeRawPtr<Range> textPiece = markedText.range();
- addMarker(textPiece->startContainer(), DocumentMarker(type, textPiece->startOffset(), textPiece->endOffset()));
+ addMarker(markedText.startContainer(), DocumentMarker(type, markedText.startOffset(), markedText.endOffset()));
}
}
@@ -126,16 +123,15 @@ void DocumentMarkerController::addTextMatchMarker(const Range* range, bool activ
{
// Use a TextIterator to visit the potentially multiple nodes the range covers.
for (TextIterator markedText(range); !markedText.atEnd(); markedText.advance()) {
- RefPtrWillBeRawPtr<Range> textPiece = markedText.range();
- unsigned startOffset = textPiece->startOffset();
- unsigned endOffset = textPiece->endOffset();
- addMarker(textPiece->startContainer(), DocumentMarker(startOffset, endOffset, activeMatch));
+ unsigned startOffset = markedText.startOffset();
+ unsigned endOffset = markedText.endOffset();
+ addMarker(markedText.startContainer(), DocumentMarker(startOffset, endOffset, activeMatch));
if (endOffset > startOffset) {
// Rendered rects for markers in WebKit are not populated until each time
// the markers are painted. However, we need it to happen sooner, because
// the whole purpose of tickmarks on the scrollbar is to show where
// matches off-screen are (that haven't been painted yet).
- Node* node = textPiece->startContainer();
+ Node* node = markedText.startContainer();
DocumentMarkerVector markers = markersFor(node);
toRenderedDocumentMarker(markers[markers.size() - 1])->setRenderedRect(range->boundingBox());
}
« no previous file with comments | « Source/core/accessibility/AXRenderObject.cpp ('k') | Source/core/dom/Range.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698