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

Unified Diff: Source/web/TextFinder.cpp

Issue 252783002: Make Range.detach() a no-op (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 8 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/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebRange.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/TextFinder.cpp
diff --git a/Source/web/TextFinder.cpp b/Source/web/TextFinder.cpp
index 291d78433d25a6de7a3304d153d617f35b86617e..206c06b85619f6a24830c61d3caf82ccc4e0bf0d 100644
--- a/Source/web/TextFinder.cpp
+++ b/Source/web/TextFinder.cpp
@@ -240,7 +240,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
if (m_resumeScopingFromRange) {
// This is a continuation of a scoping operation that timed out and didn't
// complete last time around, so we should start from where we left off.
- ASSERT(m_resumeScopingFromRange->collapsed(ASSERT_NO_EXCEPTION));
+ ASSERT(m_resumeScopingFromRange->collapsed());
searchStart = m_resumeScopingFromRange->startPosition().next();
if (searchStart.document() != searchEnd.document())
return;
@@ -269,7 +269,7 @@ void TextFinder::scopeStringMatches(int identifier, const WebString& searchText,
}
RefPtrWillBeRawPtr<Range> resultRange = Range::create(*resultStart.document(), resultStart, resultEnd);
- if (resultRange->collapsed(ASSERT_NO_EXCEPTION)) {
+ if (resultRange->collapsed()) {
// resultRange will be collapsed if the matched text spans over multiple TreeScopes.
// FIXME: Show such matches to users.
searchStart = resultStart.next();
@@ -629,7 +629,7 @@ void TextFinder::addMarker(Range* range, bool activeMatch)
void TextFinder::setMarkerActive(Range* range, bool active)
{
- if (!range || range->collapsed(IGNORE_EXCEPTION))
+ if (!range || range->collapsed())
return;
m_ownerFrame.frame()->document()->markers().setMarkersActive(range, active);
}
« no previous file with comments | « Source/web/ContextMenuClientImpl.cpp ('k') | Source/web/WebRange.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698