Oilpan: Remove WillBe types (part 5)

third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 38 matching lines @@
 {
     for (TreeScope* scope = treeScope().parentTreeScope(); scope; scope = scope->parentTreeScope()) {
         if (ScopedStyleResolver* resolver = scope->scopedStyleResolver())
             return resolver;
     }
     return nullptr;
 }
 
 void ScopedStyleResolver::addKeyframeRules(const RuleSet& ruleSet)
 {
-    const WillBeHeapVector<RawPtrWillBeMember<StyleRuleKeyframes>> keyframesRules = ruleSet.keyframesRules();
+    const HeapVector<Member<StyleRuleKeyframes>> keyframesRules = ruleSet.keyframesRules();
     for (unsigned i = 0; i < keyframesRules.size(); ++i)
         addKeyframeStyle(keyframesRules[i]);
 }
 
 void ScopedStyleResolver::addFontFaceRules(const RuleSet& ruleSet)
 {
     // FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
     if (!treeScope().rootNode().isDocumentNode())
         return;
 
     Document& document = treeScope().document();
     CSSFontSelector* cssFontSelector = document.styleEngine().fontSelector();
-    const WillBeHeapVector<RawPtrWillBeMember<StyleRuleFontFace>> fontFaceRules = ruleSet.fontFaceRules();
+    const HeapVector<Member<StyleRuleFontFace>> fontFaceRules = ruleSet.fontFaceRules();
     for (auto& fontFaceRule : fontFaceRules) {
-        if (RefPtrWillBeRawPtr<FontFace> fontFace = FontFace::create(&document, fontFaceRule))
+        if (RawPtr<FontFace> fontFace = FontFace::create(&document, fontFaceRule))
             cssFontSelector->fontFaceCache()->add(cssFontSelector, fontFaceRule, fontFace);
     }
     if (fontFaceRules.size())
         document.styleResolver()->invalidateMatchedPropertiesCache();
 }
 
 void ScopedStyleResolver::appendCSSStyleSheet(CSSStyleSheet& cssSheet, const MediaQueryEvaluator& medium)
 {
     unsigned index = m_authorStyleSheets.size();
     m_authorStyleSheets.append(&cssSheet);
     StyleSheetContents* sheet = cssSheet.contents();
     AddRuleFlags addRuleFlags = treeScope().document().getSecurityOrigin()->canRequest(sheet->baseURL()) ? RuleHasDocumentSecurityOrigin : RuleHasNoSpecialState;
     const RuleSet& ruleSet = sheet->ensureRuleSet(medium, addRuleFlags);
 
     addKeyframeRules(ruleSet);
     addFontFaceRules(ruleSet);
     addTreeBoundaryCrossingRules(ruleSet, &cssSheet, index);
     treeScope().document().styleResolver()->addViewportDependentMediaQueries(ruleSet.viewportDependentMediaQueryResults());
     treeScope().document().styleResolver()->addDeviceDependentMediaQueries(ruleSet.deviceDependentMediaQueryResults());
 }
 
-void ScopedStyleResolver::collectFeaturesTo(RuleFeatureSet& features, WillBeHeapHashSet<RawPtrWillBeMember<const StyleSheetContents>>& visitedSharedStyleSheetContents) const
+void ScopedStyleResolver::collectFeaturesTo(RuleFeatureSet& features, HeapHashSet<Member<const StyleSheetContents>>& visitedSharedStyleSheetContents) const
 {
     for (size_t i = 0; i < m_authorStyleSheets.size(); ++i) {
         ASSERT(m_authorStyleSheets[i]->ownerNode());
         StyleSheetContents* contents = m_authorStyleSheets[i]->contents();
         if (contents->hasOneClient() || visitedSharedStyleSheetContents.add(contents).isNewEntry)
             features.add(contents->ruleSet().features());
     }
 
     if (!m_treeBoundaryCrossingRuleSet)
         return;
@@ skipping 15 matching lines @@
     if (m_keyframesRuleMap.isEmpty())
         return nullptr;
 
     KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(animationName);
     if (it == m_keyframesRuleMap.end())
         return nullptr;
 
     return it->value.get();
 }
 
-void ScopedStyleResolver::addKeyframeStyle(PassRefPtrWillBeRawPtr<StyleRuleKeyframes> rule)
+void ScopedStyleResolver::addKeyframeStyle(RawPtr<StyleRuleKeyframes> rule)
 {
     AtomicString s(rule->name());
 
     if (rule->isVendorPrefixed()) {
         KeyframesRuleMap::iterator it = m_keyframesRuleMap.find(s.impl());
         if (it == m_keyframesRuleMap.end())
             m_keyframesRuleMap.set(s.impl(), rule);
         else if (it->value->isVendorPrefixed())
             m_keyframesRuleMap.set(s.impl(), rule);
     } else {
@@ skipping 49 matching lines @@
 DEFINE_TRACE(ScopedStyleResolver)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_scope);
     visitor->trace(m_authorStyleSheets);
     visitor->trace(m_keyframesRuleMap);
     visitor->trace(m_treeBoundaryCrossingRuleSet);
 #endif
 }
 
-static void addRules(RuleSet* ruleSet, const WillBeHeapVector<MinimalRuleData>& rules)
+static void addRules(RuleSet* ruleSet, const HeapVector<MinimalRuleData>& rules)
 {
     for (unsigned i = 0; i < rules.size(); ++i) {
         const MinimalRuleData& info = rules[i];
         ruleSet->addRule(info.m_rule, info.m_selectorIndex, info.m_flags);
     }
 }
 
 void ScopedStyleResolver::addTreeBoundaryCrossingRules(const RuleSet& authorRules, CSSStyleSheet* parentStyleSheet, unsigned sheetIndex)
 {
     bool isDocumentScope = treeScope().rootNode().isDocumentNode();
     if (authorRules.deepCombinatorOrShadowPseudoRules().isEmpty()
         && (isDocumentScope || (authorRules.contentPseudoElementRules().isEmpty() && authorRules.slottedPseudoElementRules().isEmpty())))
         return;
 
     if (!authorRules.deepCombinatorOrShadowPseudoRules().isEmpty())
         m_hasDeepOrShadowSelector = true;
 
-    OwnPtrWillBeRawPtr<RuleSet> ruleSetForScope = RuleSet::create();
+    RawPtr<RuleSet> ruleSetForScope = RuleSet::create();
     addRules(ruleSetForScope.get(), authorRules.deepCombinatorOrShadowPseudoRules());
 
     if (!isDocumentScope) {
         addRules(ruleSetForScope.get(), authorRules.contentPseudoElementRules());
         addRules(ruleSetForScope.get(), authorRules.slottedPseudoElementRules());
     }
 
     if (!m_treeBoundaryCrossingRuleSet) {
-        m_treeBoundaryCrossingRuleSet = adoptPtrWillBeNoop(new CSSStyleSheetRuleSubSet());
+        m_treeBoundaryCrossingRuleSet = new CSSStyleSheetRuleSubSet();
         treeScope().document().styleResolver()->addTreeBoundaryCrossingScope(treeScope().rootNode());
     }
 
     m_treeBoundaryCrossingRuleSet->append(RuleSubSet::create(parentStyleSheet, sheetIndex, ruleSetForScope.release()));
 }
 
 DEFINE_TRACE(ScopedStyleResolver::RuleSubSet)
 {
     visitor->trace(m_parentStyleSheet);
     visitor->trace(m_ruleSet);
 }
 
 } // namespace blink