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

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

Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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/editing/TextInsertionBaseCommand.cpp ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/TextIterator.cpp
diff --git a/Source/core/editing/TextIterator.cpp b/Source/core/editing/TextIterator.cpp
index c8ecc32a6125e6c73db30d6901c3e13d51072271..d80ee9f8d9bbfe2144cbebb896abb65d281c96ef 100644
--- a/Source/core/editing/TextIterator.cpp
+++ b/Source/core/editing/TextIterator.cpp
@@ -1377,8 +1377,8 @@ PassRefPtr<Range> CharacterIterator::range() const
Node* n = r->startContainer();
ASSERT(n == r->endContainer());
int offset = r->startOffset() + m_runOffset;
- r->setStart(n, offset, ASSERT_NO_EXCEPTION_STATE);
- r->setEnd(n, offset + 1, ASSERT_NO_EXCEPTION_STATE);
+ r->setStart(n, offset, ASSERT_NO_EXCEPTION);
+ r->setEnd(n, offset + 1, ASSERT_NO_EXCEPTION);
}
}
return r.release();
@@ -1476,8 +1476,8 @@ PassRefPtr<Range> BackwardsCharacterIterator::range() const
Node* n = r->startContainer();
ASSERT(n == r->endContainer());
int offset = r->endOffset() - m_runOffset;
- r->setStart(n, offset - 1, ASSERT_NO_EXCEPTION_STATE);
- r->setEnd(n, offset, ASSERT_NO_EXCEPTION_STATE);
+ r->setStart(n, offset - 1, ASSERT_NO_EXCEPTION);
+ r->setEnd(n, offset, ASSERT_NO_EXCEPTION);
}
}
return r.release();
@@ -1575,7 +1575,7 @@ void WordAwareIterator::advance()
// Start gobbling chunks until we get to a suitable stopping point
m_textIterator.appendTextTo(m_buffer);
- m_range->setEnd(m_textIterator.range()->endContainer(), m_textIterator.range()->endOffset(), IGNORE_EXCEPTION_STATE);
+ m_range->setEnd(m_textIterator.range()->endContainer(), m_textIterator.range()->endOffset(), IGNORE_EXCEPTION);
}
}
@@ -2246,8 +2246,8 @@ PassRefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope,
if (rangeLocation == 0 && rangeLength == 0 && it.atEnd()) {
textRunRange = it.range();
- resultRange->setStart(textRunRange->startContainer(), 0, ASSERT_NO_EXCEPTION_STATE);
- resultRange->setEnd(textRunRange->startContainer(), 0, ASSERT_NO_EXCEPTION_STATE);
+ resultRange->setStart(textRunRange->startContainer(), 0, ASSERT_NO_EXCEPTION);
+ resultRange->setEnd(textRunRange->startContainer(), 0, ASSERT_NO_EXCEPTION);
return resultRange.release();
}
@@ -2269,12 +2269,12 @@ PassRefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope,
it.advance();
if (!it.atEnd()) {
RefPtr<Range> range = it.range();
- textRunRange->setEnd(range->startContainer(), range->startOffset(), ASSERT_NO_EXCEPTION_STATE);
+ textRunRange->setEnd(range->startContainer(), range->startOffset(), ASSERT_NO_EXCEPTION);
} else {
Position runStart = textRunRange->startPosition();
Position runEnd = VisiblePosition(runStart).next().deepEquivalent();
if (runEnd.isNotNull())
- textRunRange->setEnd(runEnd.containerNode(), runEnd.computeOffsetInContainerNode(), ASSERT_NO_EXCEPTION_STATE);
+ textRunRange->setEnd(runEnd.containerNode(), runEnd.computeOffsetInContainerNode(), ASSERT_NO_EXCEPTION);
}
}
}
@@ -2283,24 +2283,24 @@ PassRefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope,
startRangeFound = true;
if (textRunRange->startContainer()->isTextNode()) {
int offset = rangeLocation - docTextPosition;
- resultRange->setStart(textRunRange->startContainer(), offset + textRunRange->startOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setStart(textRunRange->startContainer(), offset + textRunRange->startOffset(), IGNORE_EXCEPTION);
} else {
if (rangeLocation == docTextPosition)
- resultRange->setStart(textRunRange->startContainer(), textRunRange->startOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setStart(textRunRange->startContainer(), textRunRange->startOffset(), IGNORE_EXCEPTION);
else
- resultRange->setStart(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setStart(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION);
}
}
if (foundEnd) {
if (textRunRange->startContainer()->isTextNode()) {
int offset = rangeEnd - docTextPosition;
- resultRange->setEnd(textRunRange->startContainer(), offset + textRunRange->startOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setEnd(textRunRange->startContainer(), offset + textRunRange->startOffset(), IGNORE_EXCEPTION);
} else {
if (rangeEnd == docTextPosition)
- resultRange->setEnd(textRunRange->startContainer(), textRunRange->startOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setEnd(textRunRange->startContainer(), textRunRange->startOffset(), IGNORE_EXCEPTION);
else
- resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION);
}
docTextPosition += len;
break;
@@ -2312,7 +2312,7 @@ PassRefPtr<Range> TextIterator::rangeFromLocationAndLength(ContainerNode* scope,
return 0;
if (rangeLength != 0 && rangeEnd > docTextPosition) { // rangeEnd is out of bounds
- resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION_STATE);
+ resultRange->setEnd(textRunRange->endContainer(), textRunRange->endOffset(), IGNORE_EXCEPTION);
}
return resultRange.release();
@@ -2340,7 +2340,7 @@ bool TextIterator::getLocationAndLengthFromRange(Node* scope, const Range* range
ASSERT(testRange->startContainer() == scope);
location = TextIterator::rangeLength(testRange.get());
- testRange->setEnd(range->endContainer(), range->endOffset(), IGNORE_EXCEPTION_STATE);
+ testRange->setEnd(range->endContainer(), range->endOffset(), IGNORE_EXCEPTION);
ASSERT(testRange->startContainer() == scope);
length = TextIterator::rangeLength(testRange.get()) - location;
return true;
@@ -2378,8 +2378,8 @@ String plainText(const Range* r, TextIteratorBehavior defaultBehavior, bool isDi
static PassRefPtr<Range> collapsedToBoundary(const Range* range, bool forward)
{
- RefPtr<Range> result = range->cloneRange(ASSERT_NO_EXCEPTION_STATE);
- result->collapse(!forward, ASSERT_NO_EXCEPTION_STATE);
+ RefPtr<Range> result = range->cloneRange(ASSERT_NO_EXCEPTION);
+ result->collapse(!forward, ASSERT_NO_EXCEPTION);
return result.release();
}
@@ -2393,7 +2393,7 @@ static size_t findPlainText(CharacterIterator& it, const String& target, FindOpt
if (buffer.needsMoreContext()) {
RefPtr<Range> startRange = it.range();
RefPtr<Range> beforeStartRange = startRange->ownerDocument()->createRange();
- beforeStartRange->setEnd(startRange->startContainer(), startRange->startOffset(), IGNORE_EXCEPTION_STATE);
+ beforeStartRange->setEnd(startRange->startContainer(), startRange->startOffset(), IGNORE_EXCEPTION);
for (SimplifiedBackwardsTextIterator backwardsIterator(beforeStartRange.get()); !backwardsIterator.atEnd(); backwardsIterator.advance()) {
Vector<UChar, 1024> characters;
backwardsIterator.prependTextTo(characters);
« no previous file with comments | « Source/core/editing/TextInsertionBaseCommand.cpp ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698