Make Range.detach() a no-op

Source/web/TextFinder.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 222 matching lines @@
     }
 
     WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl();
     Position searchStart = firstPositionInNode(m_ownerFrame.frame()->document());
     Position searchEnd = lastPositionInNode(m_ownerFrame.frame()->document());
     ASSERT(searchStart.document() == searchEnd.document());
 
     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;
     }
 
     // This timeout controls how long we scope before releasing control. This
     // value does not prevent us from running for longer than this, but it is
     // periodically checked to see if we have exceeded our allocated time.
     const double maxScopingDuration = 0.1; // seconds
 
     int matchCount = 0;
     bool timedOut = false;
     double startTime = currentTime();
     do {
         // Find next occurrence of the search string.
         // FIXME: (http://crbug.com/6818) This WebKit operation may run for longer
         // than the timeout value, and is not interruptible as it is currently
         // written. We may need to rewrite it with interruptibility in mind, or
         // find an alternative.
         Position resultStart;
         Position resultEnd;
         findPlainText(searchStart, searchEnd, searchText, options.matchCase ? 0 : CaseInsensitive, resultStart, resultEnd);
         if (resultStart == resultEnd) {
             // Not found.
             break;
         }
 
         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();
             continue;
         }
 
         ++matchCount;
 
         // Catch a special case where Find found something but doesn't know what
         // the bounding box for it is. In this case we set the first match we find
@@ skipping 339 matching lines @@
     cancelPendingScopingEffort();
 }
 
 void TextFinder::addMarker(Range* range, bool activeMatch)
 {
     m_ownerFrame.frame()->document()->markers().addTextMatchMarker(range, 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);
 }
 
 int TextFinder::ordinalOfFirstMatchForFrame(WebLocalFrameImpl* frame) const
 {
     int ordinal = 0;
     WebLocalFrameImpl* mainFrameImpl = m_ownerFrame.viewImpl()->mainFrameImpl();
     // Iterate from the main frame up to (but not including) |frame| and
     // add up the number of matches found so far.
@@ skipping 86 matching lines @@
     if (!m_framesScopingCount)
         m_ownerFrame.increaseMatchCount(0, identifier);
 }
 
 int TextFinder::ordinalOfFirstMatch() const
 {
     return ordinalOfFirstMatchForFrame(&m_ownerFrame);
 }
 
 } // namespace blink