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

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

Issue 23467007: Have Range constructor take a Document reference in argument (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
Index: Source/core/editing/SurroundingText.cpp
diff --git a/Source/core/editing/SurroundingText.cpp b/Source/core/editing/SurroundingText.cpp
index aaa1d63b56deff82ece140864d5d37e7ef647fe5..e90e9e717e80730740239761e32c9f5a7d2ab114 100644
--- a/Source/core/editing/SurroundingText.cpp
+++ b/Source/core/editing/SurroundingText.cpp
@@ -52,8 +52,9 @@ SurroundingText::SurroundingText(const VisiblePosition& visiblePosition, unsigne
Position position = visiblePosition.deepEquivalent().parentAnchoredEquivalent();
Document* document = position.document();
+ ASSERT(document);
RefPtr<Range> forwardRange = forwardIterator.range();
- if (!forwardRange || !Range::create(document, position, forwardRange->startPosition())->text().length()) {
+ if (!forwardRange || !Range::create(*document, position, forwardRange->startPosition())->text().length()) {
ASSERT(forwardRange);
return;
}
@@ -68,8 +69,8 @@ SurroundingText::SurroundingText(const VisiblePosition& visiblePosition, unsigne
return;
}
- m_positionOffsetInContent = Range::create(document, backwardsRange->endPosition(), position)->text().length();
- m_contentRange = Range::create(document, backwardsRange->endPosition(), forwardRange->startPosition());
+ m_positionOffsetInContent = Range::create(*document, backwardsRange->endPosition(), position)->text().length();
+ m_contentRange = Range::create(*document, backwardsRange->endPosition(), forwardRange->startPosition());
ASSERT(m_contentRange);
}
@@ -92,7 +93,8 @@ PassRefPtr<Range> SurroundingText::rangeFromContentOffsets(unsigned startOffsetI
ASSERT(iterator.range());
Position end = iterator.range()->startPosition();
- return Range::create(start.document(), start, end);
+ ASSERT(start.document());
+ return Range::create(*start.document(), start, end);
}
String SurroundingText::content() const

Powered by Google App Engine
This is Rietveld 408576698