Oilpan: move Range object to the oilpan heap.

Source/web/TextFinder.h

 /*
  * 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TextFinder_h
 #define TextFinder_h
 
 #include "WebFindOptions.h"
 #include "core/editing/FindOptions.h"
 #include "platform/geometry/FloatRect.h"
+#include "platform/heap/Handle.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebFloatRect.h"
 #include "public/platform/WebRect.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 class Range;
@@ skipping 35 matching lines @@
     void flushCurrentScoping();
 
     void resetActiveMatch() { m_activeMatch = nullptr; }
 
     int totalMatchCount() const { return m_totalMatchCount; }
     bool scopingInProgress() const { return m_scopingInProgress; }
     void increaseMarkerVersion() { ++m_findMatchMarkersVersion; }
 
     ~TextFinder();
 
-private:
-    class DeferredScopeStringMatches;
-    friend class DeferredScopeStringMatches;
-
-    struct FindMatch {
-        RefPtr<WebCore::Range> m_range;
+    class FindMatch {
+        ALLOW_ONLY_INLINE_ALLOCATION();
+    public:
+        RefPtrWillBeMember<WebCore::Range> m_range;
 
         // 1-based index within this frame.
         int m_ordinal;
 
         // In find-in-page coordinates.
         // Lazily calculated by updateFindMatchRects.
         WebCore::FloatRect m_rect;
 
-        FindMatch(PassRefPtr<WebCore::Range>, int ordinal);
+        FindMatch(PassRefPtrWillBeRawPtr<WebCore::Range>, int ordinal);
+
+        void trace(WebCore::Visitor*);
     };
 
+private:
+    class DeferredScopeStringMatches;
+    friend class DeferredScopeStringMatches;
+
     explicit TextFinder(WebFrameImpl& ownerFrame);
 
     // Notifies the delegate about a new selection rect.
     void reportFindInPageSelection(
         const WebRect& selectionRect, int activeMatchOrdinal, int identifier);
 
     // Clear the find-in-page matches cache forcing rects to be fully
     // calculated again next time updateFindMatchRects is called.
     void clearFindMatchesCache();
 
@@ skipping 66 matching lines @@
     // Returns the ordinal of the first match in the owner frame.
     int ordinalOfFirstMatch() const;
 
     WebFrameImpl& m_ownerFrame;
 
     // A way for the main frame to keep track of which frame has an active
     // match. Should be 0 for all other frames.
     WebFrameImpl* m_currentActiveMatchFrame;
 
     // The range of the active match for the current frame.
-    RefPtr<WebCore::Range> m_activeMatch;
+    RefPtrWillBePersistent<WebCore::Range> m_activeMatch;
 
     // The index of the active match for the current frame.
     int m_activeMatchIndexInCurrentFrame;
 
     // The scoping effort can time out and we need to keep track of where we
     // ended our last search so we can continue from where we left of.
-    RefPtr<WebCore::Range> m_resumeScopingFromRange;
+    RefPtrWillBePersistent<WebCore::Range> m_resumeScopingFromRange;
 
     // Keeps track of the last string this frame searched for. This is used for
     // short-circuiting searches in the following scenarios: When a frame has
     // been searched and returned 0 results, we don't need to search that frame
     // again if the user is just adding to the search (making it more specific).
     WTF::String m_lastSearchString;
 
     // Keeps track of how many matches this frame has found so far, so that we
     // don't loose count between scoping efforts, and is also used (in conjunction
     // with m_lastSearchString) to figure out if we need to search the frame again.
@@ skipping 18 matching lines @@
     int m_nextInvalidateAfter;
 
     // A list of all of the pending calls to scopeStringMatches.
     Vector<DeferredScopeStringMatches*> m_deferredScopingWork;
 
     // Version number incremented on the main frame only whenever the document
     // find-in-page match markers change. It should be 0 for all other frames.
     int m_findMatchMarkersVersion;
 
     // Local cache of the find match markers currently displayed for this frame.
-    Vector<FindMatch> m_findMatchesCache;
+    WillBePersistentHeapVector<FindMatch> m_findMatchesCache;
 
     // Contents size when find-in-page match rects were last computed for this
     // frame's cache.
     WebCore::IntSize m_contentsSizeForCurrentFindMatchRects;
 
     // This flag is used by the scoping effort to determine if we need to figure
     // out which rectangle is the active match. Once we find the active
     // rectangle we clear this flag.
     bool m_locatingActiveRect;
 
     // Keeps track of whether there is an scoping effort ongoing in the frame.
     bool m_scopingInProgress;
 
     // Keeps track of whether the last find request completed its scoping effort
     // without finding any matches in this frame.
     bool m_lastFindRequestCompletedWithNoMatches;
 
     // Determines if the rects in the find-in-page matches cache of this frame
     // are invalid and should be recomputed.
     bool m_findMatchRectsAreValid;
 };
 
 } // namespace blink
 
+namespace WTF {
+template <> struct VectorTraits<blink::TextFinder::FindMatch> : VectorTraitsBase<blink::TextFinder::FindMatch> {
+    static const bool canInitializeWithMemset = true;
+};
+}
+
 #endif