Move inline stylesheet cache decision making from StyleSheetContents to StyleEngine

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 95 matching lines @@
 
 void StyleSheetContents::setHasSyntacticallyValidCSSHeader(bool isValidCss)
 {
     if (!isValidCss) {
         if (Document* document = clientSingleOwnerDocument())
             removeSheetFromCache(document);
     }
     m_hasSyntacticallyValidCSSHeader = isValidCss;
 }
 
-bool StyleSheetContents::maybeCacheable() const
+bool StyleSheetContents::isCacheable() const
 {
+    // This would require dealing with multiple clients for load callbacks.
+    if (!loadCompleted())
+        return false;
     // FIXME: StyleSheets with media queries can't be cached because their RuleSet
     // is processed differently based off the media queries, which might resolve
     // differently depending on the context of the parent CSSStyleSheet (e.g.
     // if they are in differently sized iframes). Once RuleSets are media query
     // agnostic, we can restore sharing of StyleSheetContents with medea queries.
     if (m_hasMediaQueries)
         return false;
     // FIXME: Support copying import rules.
     if (!m_importRules.isEmpty())
         return false;
     // FIXME: Support cached stylesheets in import rules.
     if (m_ownerRule)
         return false;
     if (m_didLoadErrorOccur)
         return false;
     // 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;
 }
 
-bool StyleSheetContents::isCacheable() const
-{
-    // This would require dealing with multiple clients for load callbacks.
-    if (!loadCompleted())
-        return false;
-    return maybeCacheable();
-}
-
 void StyleSheetContents::parserAppendRule(PassRefPtrWillBeRawPtr<StyleRuleBase> rule)
 {
     ASSERT(!rule->isCharsetRule());
     if (rule->isImportRule()) {
         // Parser enforces that @import rules come before anything else except @charset.
         ASSERT(m_childRules.isEmpty());
         StyleRuleImport* importRule = toStyleRuleImport(rule.get());
         if (importRule->mediaQueries())
             setHasMediaQueries();
         m_importRules.append(importRule);
@@ skipping 421 matching lines @@
 void StyleSheetContents::clientLoadStarted(CSSStyleSheet* sheet)
 {
     ASSERT(m_completedClients.contains(sheet));
     m_completedClients.remove(sheet);
     m_loadingClients.add(sheet);
 }
 
 void StyleSheetContents::removeSheetFromCache(Document* document)
 {
     ASSERT(document);
-    if (!maybeCacheable())
-        return;
     document->styleEngine()->removeSheet(this);
 }
 
 void StyleSheetContents::addedToMemoryCache()
 {
     ASSERT(!m_isInMemoryCache);
     ASSERT(isCacheable());
     m_isInMemoryCache = true;
 }
 
@@ skipping 91 matching lines @@
 {
     visitor->trace(m_ownerRule);
     visitor->trace(m_importRules);
     visitor->trace(m_childRules);
     visitor->trace(m_loadingClients);
     visitor->trace(m_completedClients);
     visitor->trace(m_ruleSet);
 }
 
 }