Oilpan: Remove most WillBe types from the code base

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 54 matching lines @@
     DisallowStyleSharing,
 };
 
 enum RuleMatchingBehavior {
     MatchAllRules,
     MatchAllRulesExcludingSMIL
 };
 
 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();
 
     PassRefPtr<ComputedStyle> styleForElement(Element*, const ComputedStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing,
         RuleMatchingBehavior = MatchAllRules);
 
     static PassRefPtr<AnimatableValue> createAnimatableValueSnapshot(Element&, const ComputedStyle* baseStyle, CSSPropertyID, CSSValue*);
     static PassRefPtr<AnimatableValue> createAnimatableValueSnapshot(StyleResolverState&, CSSPropertyID, CSSValue*);
 
     PassRefPtr<ComputedStyle> pseudoStyleForElement(Element*, const PseudoStyleRequest&, const ComputedStyle* parentStyle);
 
     PassRefPtr<ComputedStyle> styleForPage(int pageIndex);
     PassRefPtr<ComputedStyle> styleForText(Text*);
 
     static PassRefPtr<ComputedStyle> styleForDocument(Document&);
 
     // 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 resetRuleFeatures();
     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; }
 
     // TODO(esprehn): StyleResolver should probably not contain tree walking
     // state, instead we should pass a context object during recalcStyle.
     SelectorFilter& selectorFilter() { return m_selectorFilter; }
 
     StyleRuleKeyframes* findKeyframesRule(const Element*, const AtomicString& animationName);
 
     // These methods will give back the set of rules that matched for a given element (or a pseudo-element).
     enum CSSRuleFilter {
         UAAndUserCSSRules   = 1 << 1,
         AuthorCSSRules      = 1 << 2,
         EmptyCSSRules       = 1 << 3,
         CrossOriginCSSRules = 1 << 4,
         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&);
 
     ViewportStyleResolver* viewportStyleResolver() { return m_viewportStyleResolver.get(); }
 
     void addViewportDependentMediaQueries(const MediaQueryResultList&);
     bool hasViewportDependentMediaQueries() const { return !m_viewportDependentMediaQueryResults.isEmpty(); }
     bool mediaQueryAffectedByViewportChange() const;
     void addDeviceDependentMediaQueries(const MediaQueryResultList&);
     bool mediaQueryAffectedByDeviceChange() const;
@@ skipping 22 matching lines @@
 
     bool hasRulesForId(const AtomicString&) const;
     bool hasFullscreenUAStyle() const { return m_hasFullscreenUAStyle; }
 
     void addToStyleSharingList(Element&);
     void clearStyleSharingList();
 
     void increaseStyleSharingDepth() { ++m_styleSharingDepth; }
     void decreaseStyleSharingDepth() { --m_styleSharingDepth; }
 
-    PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElementIfNeeded(Element& parent, PseudoId);
+    RawPtr<PseudoElement> createPseudoElementIfNeeded(Element& parent, PseudoId);
 
     DECLARE_TRACE();
 
     void addTreeBoundaryCrossingScope(ContainerNode& scope);
     void initWatchedSelectorRules();
 
 private:
     explicit StyleResolver(Document&);
 
     PassRefPtr<ComputedStyle> initialStyleForElement();
@@ skipping 28 matching lines @@
     void applyAnimatedProperties(StyleResolverState&, const ActiveInterpolationsMap&);
     template <CSSPropertyPriority priority>
     void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly, PropertyWhitelistType);
     template <CSSPropertyPriority priority>
     void applyPropertiesForApplyAtRule(StyleResolverState&, const CSSValue*, bool isImportant, bool inheritedOnly, PropertyWhitelistType);
 
     bool pseudoStyleForElementInternal(Element&, const PseudoStyleRequest&, const ComputedStyle* parentStyle, StyleResolverState&);
     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; }
 
     static ComputedStyle* s_styleNotYetAvailable;
 
     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;
 
     bool m_needCollectFeatures;
     bool m_printMediaType;
     bool m_hasFullscreenUAStyle = false;
 
     unsigned m_styleSharingDepth;
-    WillBeHeapVector<OwnPtrWillBeMember<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;
+    HeapVector<Member<StyleSharingList>, styleSharingMaxDepth> m_styleSharingLists;
 };
 
 } // namespace blink
 
 #endif // StyleResolver_h