Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/css/resolver/StyleResolver.h

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
index 3c6c0657664936bc7ef8a051e5d1c3498c9a6b9b..29574e77f50a576c729ca9496dcb8e06c2b2b20d 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
@@ -72,16 +72,16 @@ enum RuleMatchingBehavior {
 
 const unsigned styleSharingListSize = 15;
 const unsigned styleSharingMaxDepth = 32;
-using StyleSharingList = WillBeHeapDeque<RawPtrWillBeMember<Element>, styleSharingListSize>;
+using StyleSharingList = HeapDeque<Member<Element>, styleSharingListSize>;
 using ActiveInterpolationsMap = HashMap<PropertyHandle, Vector<RefPtr<Interpolation>, 1>>;
 
 // This class selects a ComputedStyle for a given element based on a collection of stylesheets.
-class CORE_EXPORT StyleResolver final : public NoBaseWillBeGarbageCollectedFinalized<StyleResolver> {
-    WTF_MAKE_NONCOPYABLE(StyleResolver); USING_FAST_MALLOC_WILL_BE_REMOVED(StyleResolver);
+class CORE_EXPORT StyleResolver final : public GarbageCollectedFinalized<StyleResolver> {
+    WTF_MAKE_NONCOPYABLE(StyleResolver);
 public:
-    static PassOwnPtrWillBeRawPtr<StyleResolver> create(Document& document)
+    static RawPtr<StyleResolver> create(Document& document)
     {
-        return adoptPtrWillBeNoop(new StyleResolver(document));
+        return (new StyleResolver(document));
     }
     ~StyleResolver();
     void dispose();
@@ -101,12 +101,12 @@ public:
 
     // FIXME: It could be better to call appendAuthorStyleSheets() directly after we factor StyleResolver further.
     // https://bugs.webkit.org/show_bug.cgi?id=108890
-    void appendAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>&);
+    void appendAuthorStyleSheets(const HeapVector<Member<CSSStyleSheet>>&);
     void resetAuthorStyle(TreeScope&);
     void finishAppendAuthorStyleSheets();
 
-    void lazyAppendAuthorStyleSheets(unsigned firstNew, const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>&);
-    void removePendingAuthorStyleSheets(const WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>>&);
+    void lazyAppendAuthorStyleSheets(unsigned firstNew, const HeapVector<Member<CSSStyleSheet>>&);
+    void removePendingAuthorStyleSheets(const HeapVector<Member<CSSStyleSheet>>&);
     void appendPendingAuthorStyleSheets();
     bool hasPendingAuthorStyleSheets() const { return m_pendingStyleSheets.size() > 0 || m_needCollectFeatures; }
 
@@ -125,9 +125,9 @@ public:
         AllButEmptyCSSRules = UAAndUserCSSRules | AuthorCSSRules | CrossOriginCSSRules,
         AllCSSRules         = AllButEmptyCSSRules | EmptyCSSRules,
     };
-    PassRefPtrWillBeRawPtr<CSSRuleList> cssRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);
-    PassRefPtrWillBeRawPtr<CSSRuleList> pseudoCSSRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
-    PassRefPtrWillBeRawPtr<StyleRuleList> styleRulesForElement(Element*, unsigned rulesToInclude);
+    RawPtr<CSSRuleList> cssRulesForElement(Element*, unsigned rulesToInclude = AllButEmptyCSSRules);
+    RawPtr<CSSRuleList> pseudoCSSRulesForElement(Element*, PseudoId, unsigned rulesToInclude = AllButEmptyCSSRules);
+    RawPtr<StyleRuleList> styleRulesForElement(Element*, unsigned rulesToInclude);
 
     void computeFont(ComputedStyle*, const StylePropertySet&);
 
@@ -169,7 +169,7 @@ public:
     void increaseStyleSharingDepth() { ++m_styleSharingDepth; }
     void decreaseStyleSharingDepth() { --m_styleSharingDepth; }
 
-    PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElementIfNeeded(Element& parent, PseudoId);
+    RawPtr<PseudoElement> createPseudoElementIfNeeded(Element& parent, PseudoId);
 
     DECLARE_TRACE();
 
@@ -216,7 +216,7 @@ private:
     bool hasAuthorBackground(const StyleResolverState&);
     bool hasAuthorBorder(const StyleResolverState&);
 
-    PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElement(Element* parent, PseudoId);
+    RawPtr<PseudoElement> createPseudoElement(Element* parent, PseudoId);
 
     Document& document() { return *m_document; }
 
@@ -224,23 +224,23 @@ private:
 
     MatchedPropertiesCache m_matchedPropertiesCache;
 
-    OwnPtrWillBeMember<MediaQueryEvaluator> m_medium;
+    Member<MediaQueryEvaluator> m_medium;
     MediaQueryResultList m_viewportDependentMediaQueryResults;
     MediaQueryResultList m_deviceDependentMediaQueryResults;
 
-    RawPtrWillBeMember<Document> m_document;
+    Member<Document> m_document;
     SelectorFilter m_selectorFilter;
 
-    OwnPtrWillBeMember<ViewportStyleResolver> m_viewportStyleResolver;
+    Member<ViewportStyleResolver> m_viewportStyleResolver;
 
-    WillBeHeapListHashSet<RawPtrWillBeMember<CSSStyleSheet>, 16> m_pendingStyleSheets;
+    HeapListHashSet<Member<CSSStyleSheet>, 16> m_pendingStyleSheets;
 
     // FIXME: The entire logic of collecting features on StyleResolver, as well as transferring them
     // between various parts of machinery smells wrong. This needs to be better somehow.
     RuleFeatureSet m_features;
-    OwnPtrWillBeMember<RuleSet> m_siblingRuleSet;
-    OwnPtrWillBeMember<RuleSet> m_uncommonAttributeRuleSet;
-    OwnPtrWillBeMember<RuleSet> m_watchedSelectorsRules;
+    Member<RuleSet> m_siblingRuleSet;
+    Member<RuleSet> m_uncommonAttributeRuleSet;
+    Member<RuleSet> m_watchedSelectorsRules;
 
     DocumentOrderedList m_treeBoundaryCrossingScopes;
 
@@ -248,7 +248,7 @@ private:
     bool m_printMediaType;
 
     unsigned m_styleSharingDepth;
-    WillBeHeapVector<OwnPtrWillBeMember<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;
+    HeapVector<Member<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;
 };
 
 } // namespace blink