Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1466)

Unified Diff: third_party/WebKit/Source/web/TextFinder.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/TextFinder.h
diff --git a/third_party/WebKit/Source/web/TextFinder.h b/third_party/WebKit/Source/web/TextFinder.h
index e639c9716c52990d0ec0050511e41d9dd9a33fbe..a79ebfc3e2783b461e287f088fac6593402da4e8 100644
--- a/third_party/WebKit/Source/web/TextFinder.h
+++ b/third_party/WebKit/Source/web/TextFinder.h
@@ -50,9 +50,9 @@ class WebLocalFrameImpl;
template <typename T> class WebVector;
-class TextFinder final : public NoBaseWillBeGarbageCollectedFinalized<TextFinder> {
+class TextFinder final : public GarbageCollectedFinalized<TextFinder> {
public:
- static PassOwnPtrWillBeRawPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame);
+ static RawPtr<TextFinder> create(WebLocalFrameImpl& ownerFrame);
bool find(
int identifier, const WebString& searchText, const WebFindOptions&,
@@ -91,11 +91,11 @@ public:
class FindMatch {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public:
- FindMatch(PassRefPtrWillBeRawPtr<Range>, int ordinal);
+ FindMatch(RawPtr<Range>, int ordinal);
DECLARE_TRACE();
- RefPtrWillBeMember<Range> m_range;
+ Member<Range> m_range;
// 1-based index within this frame.
int m_ordinal;
@@ -209,14 +209,14 @@ private:
// Returns the ordinal of the first match in the owner frame.
int ordinalOfFirstMatch() const;
- RawPtrWillBeMember<WebLocalFrameImpl> m_ownerFrame;
+ Member<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.
- RawPtrWillBeMember<WebLocalFrameImpl> m_currentActiveMatchFrame;
+ Member<WebLocalFrameImpl> m_currentActiveMatchFrame;
// The range of the active match for the current frame.
- RefPtrWillBeMember<Range> m_activeMatch;
+ Member<Range> m_activeMatch;
// The index of the active match for the current frame.
int m_activeMatchIndexInCurrentFrame;
@@ -226,7 +226,7 @@ private:
//
// This range is collapsed to the end position of the last successful
// search; the new search should start from this position.
- RefPtrWillBeMember<Range> m_resumeScopingFromRange;
+ Member<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
@@ -258,14 +258,14 @@ private:
int m_nextInvalidateAfter;
// A list of all of the pending calls to scopeStringMatches.
- WillBeHeapVector<OwnPtrWillBeMember<DeferredScopeStringMatches>> m_deferredScopingWork;
+ HeapVector<Member<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.
- WillBeHeapVector<FindMatch> m_findMatchesCache;
+ HeapVector<FindMatch> m_findMatchesCache;
// Contents size when find-in-page match rects were last computed for this
// frame's cache.

Powered by Google App Engine
This is Rietveld 408576698