Invalidate paint of tickmarks on document change

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 133 matching lines @@
         | (options.medialCapitalAsWordStart ? TreatMedialCapitalAsWordStart : 0)
         | (options.findNext ? 0 : StartInSelection);
     m_activeMatch = ownerFrame().frame()->editor().findStringAndScrollToVisible(searchText, m_activeMatch.get(), findOptions);
 
     if (!m_activeMatch) {
         // If we're finding next the next active match might not be in the current frame.
         // In this case we don't want to clear the matches cache.
         if (!options.findNext)
             clearFindMatchesCache();
 
-        ownerFrame().invalidateAll();
+        ownerFrame().frameView()->invalidatePaintForTickmarks();
         return false;
     }
 
 #if OS(ANDROID)
     ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));
 #endif
 
     setMarkerActive(m_activeMatch.get(), true);
     WebLocalFrameImpl* oldActiveFrame = mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame;
     mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &ownerFrame();
@@ skipping 34 matching lines @@
 
 void TextFinder::stopFindingAndClearSelection()
 {
     cancelPendingScopingEffort();
 
     // Remove all markers for matches found and turn off the highlighting.
     ownerFrame().frame()->document()->markers().removeMarkers(DocumentMarker::TextMatch);
     ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(false);
     clearFindMatchesCache();
 
-    // Let the frame know that we don't want tickmarks or highlighting anymore.

[chrishtr, 2015/04/20 17:53:25]

Highlighting is not relevant here? Just checking based on the previous comment.

[Xianzhu, 2015/04/20 18:13:48]

Highlightings have been removed by line 205, not relevant to the next line.

-    ownerFrame().invalidateAll();
+    // Let the frame know that we don't want tickmarks anymore.
+    ownerFrame().frameView()->invalidatePaintForTickmarks();
 }
 
 void TextFinder::reportFindInPageResultToAccessibility(int identifier)
 {
     AXObjectCacheImpl* axObjectCache = toAXObjectCacheImpl(ownerFrame().frame()->document()->existingAXObjectCache());
     if (!axObjectCache)
         return;
 
     AXObject* startObject = axObjectCache->get(m_activeMatch->startContainer());
     AXObject* endObject = axObjectCache->get(m_activeMatch->endContainer());
@@ skipping 183 matching lines @@
 }
 
 void TextFinder::finishCurrentScopingEffort(int identifier)
 {
     flushCurrentScopingEffort(identifier);
 
     m_scopingInProgress = false;
     m_lastFindRequestCompletedWithNoMatches = !m_lastMatchCount;
 
     // This frame is done, so show any scrollbar tickmarks we haven't drawn yet.
-    ownerFrame().invalidateScrollbar();
+    ownerFrame().frameView()->invalidatePaintForTickmarks();
 }
 
 void TextFinder::cancelPendingScopingEffort()
 {
 #if ENABLE(OILPAN)
     for (DeferredScopeStringMatches* deferredWork : m_deferredScopingWork)
         deferredWork->dispose();
 #endif
     m_deferredScopingWork.clear();
 
@@ skipping 312 matching lines @@
     m_deferredScopingWork.remove(index);
 
     scopeStringMatches(identifier, searchText, options, reset);
 }
 
 void TextFinder::invalidateIfNecessary()
 {
     if (m_lastMatchCount <= m_nextInvalidateAfter)
         return;
 
-    // FIXME: (http://b/1088165) Optimize the drawing of the tickmarks and
+    // FIXME: (http://crbug.com/6819) Optimize the drawing of the tickmarks and
     // remove this. This calculation sets a milestone for when next to
     // invalidate the scrollbar and the content area. We do this so that we
     // don't spend too much time drawing the scrollbar over and over again.
     // Basically, up until the first 500 matches there is no throttle.
     // After the first 500 matches, we set set the milestone further and
     // further out (750, 1125, 1688, 2K, 3K).
     static const int startSlowingDownAfter = 500;
     static const int slowdown = 750;
 
     int i = m_lastMatchCount / startSlowingDownAfter;
     m_nextInvalidateAfter += i * slowdown;
-    ownerFrame().invalidateScrollbar();
+    ownerFrame().frameView()->invalidatePaintForTickmarks();
 }
 
 void TextFinder::flushCurrentScoping()
 {
     flushCurrentScopingEffort(m_findRequestIdentifier);
 }
 
 void TextFinder::setMatchMarkerActive(bool active)
 {
     setMarkerActive(m_activeMatch.get(), active);
@@ skipping 20 matching lines @@
 {
     visitor->trace(m_ownerFrame);
     visitor->trace(m_currentActiveMatchFrame);
     visitor->trace(m_activeMatch);
     visitor->trace(m_resumeScopingFromRange);
     visitor->trace(m_deferredScopingWork);
     visitor->trace(m_findMatchesCache);
 }
 
 } // namespace blink