Remove second set of clients from StyleSheetContents.

sky/engine/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 64 matching lines @@
 bool StyleSheetContents::parseString(const String& sheetText)
 {
     CSSParserContext context(parserContext(), UseCounter::getFrom(this));
     BisonCSSParser p(context);
     p.parseSheet(this, sheetText);
     return true;
 }
 
 void StyleSheetContents::registerClient(CSSStyleSheet* sheet)
 {
-    ASSERT(!m_loadingClients.contains(sheet) && !m_completedClients.contains(sheet));
+    ASSERT(!m_clients.contains(sheet));
 
     // InspectorCSSAgent::buildObjectForRule creates CSSStyleSheet without any owner node.
     if (!sheet->ownerDocument())
         return;
-    m_loadingClients.add(sheet);
+    m_clients.add(sheet);
 }
 
 void StyleSheetContents::unregisterClient(CSSStyleSheet* sheet)
 {
-    m_loadingClients.remove(sheet);
-    m_completedClients.remove(sheet);
+    m_clients.remove(sheet);
 
-    if (!sheet->ownerDocument() || !m_loadingClients.isEmpty() || !m_completedClients.isEmpty())
+    if (!sheet->ownerDocument() || !m_clients.isEmpty())
         return;
     sheet->ownerDocument()->styleEngine()->removeSheet(this);
 }
 
 void StyleSheetContents::shrinkToFit()
 {
     m_childRules.shrinkToFit();
 }
 
 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(HashSet<RawPtr<CSSStyleSheet> >& clients)
-{
-    for (HashSet<RawPtr<CSSStyleSheet> >::iterator it = clients.begin(); it != clients.end(); ++it) {
-        if (Document* document = (*it)->ownerDocument())
-            document->styleEngine()->clearResolver();
-    }
-}
-
 void StyleSheetContents::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);
+    for (RawPtr<CSSStyleSheet> client : m_clients) {
+        if (Document* document = client->ownerDocument())
+            document->styleEngine()->clearResolver();
+    }
     m_ruleSet.clear();
 }
 
-static void removeFontFaceRules(HashSet<RawPtr<CSSStyleSheet> >& clients, const StyleRuleFontFace* fontFaceRule)
-{
-    for (HashSet<RawPtr<CSSStyleSheet> >::iterator it = clients.begin(); it != clients.end(); ++it) {
-        if (Node* ownerNode = (*it)->ownerNode())
-            ownerNode->document().styleEngine()->removeFontFaceRules(Vector<RawPtr<const StyleRuleFontFace> >(1, fontFaceRule));
-    }
 }
-
-void StyleSheetContents::notifyRemoveFontFaceRule(const StyleRuleFontFace* fontFaceRule)
-{
-    removeFontFaceRules(m_loadingClients, fontFaceRule);
-    removeFontFaceRules(m_completedClients, fontFaceRule);
-}
-
-}