Oilpan: move TextFinder to the 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 32 matching lines @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Range;
 class WebLocalFrameImpl;
 
 template <typename T> class WebVector;
 
-class TextFinder {
+class TextFinder final : public NoBaseWillBeGarbageCollectedFinalized<TextFinder> {
 public:
-    static PassOwnPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame);
+    static PassOwnPtrWillBeRawPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame);
 
     bool find(
         int identifier, const WebString& searchText, const WebFindOptions&,
         bool wrapWithinFrame, WebRect* selectionRect);
     void stopFindingAndClearSelection();
     void scopeStringMatches(
         int identifier, const WebString& searchText, const WebFindOptions&,
         bool reset);
     void cancelPendingScopingEffort();
     void increaseMatchCount(int identifier, int count);
@@ skipping 18 matching lines @@
 
     int totalMatchCount() const { return m_totalMatchCount; }
     bool scopingInProgress() const { return m_scopingInProgress; }
     void increaseMarkerVersion() { ++m_findMatchMarkersVersion; }
 
     ~TextFinder();
 
     class FindMatch {
         ALLOW_ONLY_INLINE_ALLOCATION();
     public:
+        FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
+
+        void trace(Visitor*);
+
         RefPtrWillBeMember<Range> m_range;
 
         // 1-based index within this frame.
         int m_ordinal;
 
         // In find-in-page coordinates.
         // Lazily calculated by updateFindMatchRects.
         FloatRect m_rect;
+    };
 
-        FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
-
-        void trace(Visitor*);
-    };
+    void trace(Visitor*);
 
 private:
     class DeferredScopeStringMatches;
     friend class DeferredScopeStringMatches;
 
     explicit TextFinder(WebLocalFrameImpl& ownerFrame);
 
     // Notifies the delegate about a new selection rect.
     void reportFindInPageSelection(
         const WebRect& selectionRect, int activeMatchOrdinal, int identifier);
@@ skipping 61 matching lines @@
         const WebFindOptions&, bool reset);
 
     // Determines whether to invalidate the content area and scrollbar.
     void invalidateIfNecessary();
 
     // Sets the markers within a current match range as active or inactive.
     void setMatchMarkerActive(bool);
 
     void decrementFramesScopingCount(int identifier);
 
+    WebLocalFrameImpl& ownerFrame() const
+    {
+        ASSERT(m_ownerFrame);
+        return *m_ownerFrame;
+    }
+
     // Returns the ordinal of the first match in the owner frame.
     int ordinalOfFirstMatch() const;
 
-    WebLocalFrameImpl& m_ownerFrame;
+    RawPtrWillBeMember<WebLocalFrameImpl> 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.
-    WebLocalFrameImpl* m_currentActiveMatchFrame;
+    RawPtrWillBeMember<WebLocalFrameImpl> m_currentActiveMatchFrame;
 
     // The range of the active match for the current frame.
-    RefPtrWillBePersistent<Range> m_activeMatch;
+    RefPtrWillBeMember<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.
     //
     // This range is collapsed to the end position of the last successful
     // search; the new search should start from this position.
-    RefPtrWillBePersistent<Range> m_resumeScopingFromRange;
+    RefPtrWillBeMember<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 lose 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 11 matching lines @@
 
     // Identifier of the latest find-in-page request. Required to be stored in
     // the frame in order to reply if required in case the frame is detached.
     int m_findRequestIdentifier;
 
     // Keeps track of when the scoping effort should next invalidate the scrollbar
     // and the frame area.
     int m_nextInvalidateAfter;
 
     // A list of all of the pending calls to scopeStringMatches.
-    Vector<DeferredScopeStringMatches*> m_deferredScopingWork;
+    WillBeHeapVector<OwnPtrWillBeMember<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.
-    WillBePersistentHeapVector<FindMatch> m_findMatchesCache;
+    WillBeHeapVector<FindMatch> m_findMatchesCache;
 
     // Contents size when find-in-page match rects were last computed for this
     // frame's cache.
     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
 
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch);
 
-#endif
+#endif // TextFinder_h