Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/css/StyleSheetContents.cpp

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2012 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 124 matching lines @@
     // It is not the original sheet anymore.
     if (m_isMutable)
         return false;
     // If the header is valid we are not going to need to check the SecurityOrigin.
     // FIXME: Valid mime type avoids the check too.
     if (!m_hasSyntacticallyValidCSSHeader)
         return false;
     return true;
 }
 
-void StyleSheetContents::parserAppendRule(PassRefPtrWillBeRawPtr<StyleRuleBase> rule)
+void StyleSheetContents::parserAppendRule(RawPtr<StyleRuleBase> rule)
 {
     if (rule->isImportRule()) {
         // Parser enforces that @import rules come before anything else
         ASSERT(m_childRules.isEmpty());
         StyleRuleImport* importRule = toStyleRuleImport(rule.get());
         if (importRule->mediaQueries())
             setHasMediaQueries();
         m_importRules.append(importRule);
         m_importRules.last()->setParentStyleSheet(this);
         m_importRules.last()->requestStyleSheet();
@@ skipping 49 matching lines @@
 {
     for (unsigned i = 0; i < m_importRules.size(); ++i) {
         ASSERT(m_importRules.at(i)->parentStyleSheet() == this);
         m_importRules[i]->clearParentStyleSheet();
     }
     m_importRules.clear();
     m_namespaceRules.clear();
     m_childRules.clear();
 }
 
-bool StyleSheetContents::wrapperInsertRule(PassRefPtrWillBeRawPtr<StyleRuleBase> rule, unsigned index)
+bool StyleSheetContents::wrapperInsertRule(RawPtr<StyleRuleBase> rule, unsigned index)
 {
     ASSERT(m_isMutable);
     ASSERT_WITH_SECURITY_IMPLICATION(index <= ruleCount());
 
     if (index < m_importRules.size() || (index == m_importRules.size() && rule->isImportRule())) {
         // Inserting non-import rule before @import is not allowed.
         if (!rule->isImportRule())
             return false;
 
         StyleRuleImport* importRule = toStyleRuleImport(rule.get());
@@ skipping 141 matching lines @@
 }
 
 void StyleSheetContents::checkLoaded()
 {
     if (isLoading())
         return;
 
     // Avoid |this| being deleted by scripts that run via
     // ScriptableDocumentParser::executeScriptsWaitingForResources().
     // See https://bugs.webkit.org/show_bug.cgi?id=95106
-    RefPtrWillBeRawPtr<StyleSheetContents> protect(this);
+    RawPtr<StyleSheetContents> protect(this);
 
     StyleSheetContents* parentSheet = parentStyleSheet();
     if (parentSheet) {
         parentSheet->checkLoaded();
         return;
     }
 
     ASSERT(this == rootStyleSheet());
     if (m_loadingClients.isEmpty())
         return;
 
     // Avoid |CSSSStyleSheet| and |ownerNode| being deleted by scripts that run via
     // ScriptableDocumentParser::executeScriptsWaitingForResources(). Also protect
     // the |CSSStyleSheet| from being deleted during iteration via the |sheetLoaded|
     // method.
     //
     // When a sheet is loaded it is moved from the set of loading clients
     // to the set of completed clients. We therefore need the copy in order to
     // not modify the set while iterating it.
-    WillBeHeapVector<RefPtrWillBeMember<CSSStyleSheet>> loadingClients;
+    HeapVector<Member<CSSStyleSheet>> loadingClients;
     copyToVector(m_loadingClients, loadingClients);
 
     for (unsigned i = 0; i < loadingClients.size(); ++i) {
         if (loadingClients[i]->loadCompleted())
             continue;
 
         // sheetLoaded might be invoked after its owner node is removed from document.
-        if (RefPtrWillBeRawPtr<Node> ownerNode = loadingClients[i]->ownerNode()) {
+        if (RawPtr<Node> ownerNode = loadingClients[i]->ownerNode()) {
             if (loadingClients[i]->sheetLoaded())
                 ownerNode->notifyLoadedSheetAndAllCriticalSubresources(m_didLoadErrorOccur ? Node::ErrorOccurredLoadingSubresource : Node::NoErrorLoadingSubresource);
         }
     }
 }
 
 void StyleSheetContents::notifyLoadedSheet(const CSSStyleSheetResource* sheet)
 {
     ASSERT(sheet);
     m_didLoadErrorOccur |= sheet->errorOccurred();
     // updateLayoutIgnorePendingStyleSheets can cause us to create the RuleSet on this
     // sheet before its imports have loaded. So clear the RuleSet when the imports
     // load since the import's subrules are flattened into its parent sheet's RuleSet.
     clearRuleSet();
 }
 
 void StyleSheetContents::startLoadingDynamicSheet()
 {
     StyleSheetContents* root = rootStyleSheet();
     for (const auto& client : root->m_loadingClients)
         client->startLoadingDynamicSheet();
     // Copy the completed clients to a vector for iteration.
     // startLoadingDynamicSheet will move the style sheet from the
     // completed state to the loading state which modifies the set of
     // completed clients. We therefore need the copy in order to not
     // modify the set of completed clients while iterating it.
-    WillBeHeapVector<RawPtrWillBeMember<CSSStyleSheet>> completedClients;
+    HeapVector<Member<CSSStyleSheet>> completedClients;
     copyToVector(root->m_completedClients, completedClients);
     for (unsigned i = 0; i < completedClients.size(); ++i)
         completedClients[i]->startLoadingDynamicSheet();
 }
 
 StyleSheetContents* StyleSheetContents::rootStyleSheet() const
 {
     const StyleSheetContents* root = this;
     while (root->parentStyleSheet())
         root = root->parentStyleSheet();
@@ skipping 14 matching lines @@
         return (*root->m_loadingClients.begin())->ownerNode();
     return (*root->m_completedClients.begin())->ownerNode();
 }
 
 Document* StyleSheetContents::singleOwnerDocument() const
 {
     StyleSheetContents* root = rootStyleSheet();
     return root->clientSingleOwnerDocument();
 }
 
-static bool childRulesHaveFailedOrCanceledSubresources(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& rules)
+static bool childRulesHaveFailedOrCanceledSubresources(const HeapVector<Member<StyleRuleBase>>& rules)
 {
     for (unsigned i = 0; i < rules.size(); ++i) {
         const StyleRuleBase* rule = rules[i].get();
         switch (rule->type()) {
         case StyleRuleBase::Style:
             if (toStyleRule(rule)->properties().hasFailedOrCanceledSubresources())
                 return true;
             break;
         case StyleRuleBase::FontFace:
             if (toStyleRuleFontFace(rule)->properties().hasFailedOrCanceledSubresources())
@@ skipping 107 matching lines @@
 
 RuleSet& StyleSheetContents::ensureRuleSet(const MediaQueryEvaluator& medium, AddRuleFlags addRuleFlags)
 {
     if (!m_ruleSet) {
         m_ruleSet = RuleSet::create();
         m_ruleSet->addRulesFromSheet(this, medium, addRuleFlags);
     }
     return *m_ruleSet.get();
 }
 
-static void clearResolvers(WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSStyleSheet>>& clients)
+static void clearResolvers(HeapHashSet<WeakMember<CSSStyleSheet>>& clients)
 {
     for (const auto& sheet : clients) {
         if (Document* document = sheet->ownerDocument())
             document->styleEngine().clearResolver();
     }
 }
 
 void StyleSheetContents::clearRuleSet()
 {
     if (StyleSheetContents* parentSheet = parentStyleSheet())
         parentSheet->clearRuleSet();
 
     // Don't want to clear the StyleResolver if the RuleSet hasn't been created
     // since we only clear the StyleResolver so that it's members are properly
     // updated in ScopedStyleResolver::addRulesFromSheet.
     if (!m_ruleSet)
         return;
 
     // Clearing the ruleSet means we need to recreate the styleResolver data structures.
     // See the StyleResolver calls in ScopedStyleResolver::addRulesFromSheet.
     clearResolvers(m_loadingClients);
     clearResolvers(m_completedClients);
     m_ruleSet.clear();
 }
 
-static void removeFontFaceRules(WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSStyleSheet>>& clients, const StyleRuleFontFace* fontFaceRule)
+static void removeFontFaceRules(HeapHashSet<WeakMember<CSSStyleSheet>>& clients, const StyleRuleFontFace* fontFaceRule)
 {
     for (const auto& sheet : clients) {
         if (Node* ownerNode = sheet->ownerNode())
-            ownerNode->document().styleEngine().removeFontFaceRules(WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>(1, fontFaceRule));
+            ownerNode->document().styleEngine().removeFontFaceRules(HeapVector<Member<const StyleRuleFontFace>>(1, fontFaceRule));
     }
 }
 
 void StyleSheetContents::notifyRemoveFontFaceRule(const StyleRuleFontFace* fontFaceRule)
 {
     StyleSheetContents* root = rootStyleSheet();
     removeFontFaceRules(root->m_loadingClients, fontFaceRule);
     removeFontFaceRules(root->m_completedClients, fontFaceRule);
 }
 
-static void findFontFaceRulesFromRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& rules, WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>& fontFaceRules)
+static void findFontFaceRulesFromRules(const HeapVector<Member<StyleRuleBase>>& rules, HeapVector<Member<const StyleRuleFontFace>>& fontFaceRules)
 {
     for (unsigned i = 0; i < rules.size(); ++i) {
         StyleRuleBase* rule = rules[i].get();
 
         if (rule->isFontFaceRule()) {
             fontFaceRules.append(toStyleRuleFontFace(rule));
         } else if (rule->isMediaRule()) {
             StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
             // We cannot know whether the media rule matches or not, but
             // for safety, remove @font-face in the media rule (if exists).
             findFontFaceRulesFromRules(mediaRule->childRules(), fontFaceRules);
         }
     }
 }
 
-void StyleSheetContents::findFontFaceRules(WillBeHeapVector<RawPtrWillBeMember<const StyleRuleFontFace>>& fontFaceRules)
+void StyleSheetContents::findFontFaceRules(HeapVector<Member<const StyleRuleFontFace>>& fontFaceRules)
 {
     for (unsigned i = 0; i < m_importRules.size(); ++i) {
         if (!m_importRules[i]->styleSheet())
             continue;
         m_importRules[i]->styleSheet()->findFontFaceRules(fontFaceRules);
     }
 
     findFontFaceRulesFromRules(childRules(), fontFaceRules);
 }
 
 DEFINE_TRACE(StyleSheetContents)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_ownerRule);
     visitor->trace(m_importRules);
     visitor->trace(m_namespaceRules);
     visitor->trace(m_childRules);
     visitor->trace(m_loadingClients);
     visitor->trace(m_completedClients);
     visitor->trace(m_ruleSet);
 #endif
 }
 
 } // namespace blink