Fix incorrect number of matches and misleading highlighting in "Find on Page" results

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 224 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());
-        searchStart = m_resumeScopingFromRange->startPosition().next();
+        searchStart = m_resumeScopingFromRange->startPosition();
         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;
@@ skipping 55 matching lines @@
         }
 
         addMarker(resultRange.get(), foundActiveMatch);
 
         m_findMatchesCache.append(FindMatch(resultRange.get(), m_lastMatchCount + matchCount));
 
         // Set the new start for the search range to be the end of the previous
         // result range. There is no need to use a VisiblePosition here,
         // since findPlainText will use a TextIterator to go over the visible
         // text nodes.
-        searchStart = resultStart.next();
+        searchStart = resultEnd;
 
         m_resumeScopingFromRange = Range::create(*resultStart.document(), resultStart, resultStart);
         timedOut = (currentTime() - startTime) >= maxScopingDuration;
     } while (!timedOut);
 
     // Remember what we search for last time, so we can skip searching if more
     // letters are added to the search string (and last outcome was 0).
     m_lastSearchString = searchText;
 
     if (matchCount > 0) {
@@ skipping 398 matching lines @@
     if (!m_framesScopingCount)
         m_ownerFrame.increaseMatchCount(0, identifier);
 }
 
 int TextFinder::ordinalOfFirstMatch() const
 {
     return ordinalOfFirstMatchForFrame(&m_ownerFrame);
 }
 
 } // namespace blink