Merge StyleSheetCollection into ScopedStyleResolver.

sky/engine/core/css/resolver/StyleResolver.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 113 matching lines @@
 {
     FrameView* view = document.view();
     if (view) {
         m_medium = adoptPtr(new MediaQueryEvaluator(&view->frame()));
         m_printMediaType = equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
     } else {
         m_medium = adoptPtr(new MediaQueryEvaluator("all"));
     }
 }
 
-void StyleResolver::appendCSSStyleSheet(CSSStyleSheet* cssSheet)
-{
-    ASSERT(cssSheet);
-    if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), &m_viewportDependentMediaQueryResults))
-        return;
-
-    Node* ownerNode = cssSheet->ownerNode();
-    if (!ownerNode)
-        return;
-
-    TreeScope& treeScope = ownerNode->treeScope();
-    treeScope.scopedStyleResolver().addRulesFromSheet(cssSheet);
-
-    // FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
-    if (ownerNode->isDocumentNode()) {
-        CSSFontSelector* fontSelector = document().styleEngine()->fontSelector();
-        RuleSet& ruleSet = cssSheet->contents()->ruleSet();
-        const Vector<RawPtr<StyleRuleFontFace> > fontFaceRules = ruleSet.fontFaceRules();
-        for (unsigned i = 0; i < fontFaceRules.size(); ++i) {
-            if (RefPtr<FontFace> fontFace = FontFace::create(&document(), fontFaceRules[i]))
-                fontSelector->fontFaceCache()->add(fontSelector, fontFaceRules[i], fontFace);
-        }
-        if (fontFaceRules.size())
-            invalidateMatchedPropertiesCache();
-    }
-}
-
 void StyleResolver::addToStyleSharingList(Element& element)
 {
     // Never add elements to the style sharing list if we're not in a recalcStyle,
     // otherwise we could leave stale pointers in there.
     if (!document().inStyleRecalc())
         return;
     ASSERT(element.supportsStyleSharing());
     INCREMENT_STYLE_STATS_COUNTER(*this, sharedStyleCandidates);
     StyleSharingList& list = styleSharingList();
     if (list.size() >= styleSharingListSize)
@@ skipping 552 matching lines @@
                 updateFont(state);
                 break;
             default:
                 break;
             }
             StyleBuilder::applyProperty(properties[i].property, state, properties[i].value);
         }
     }
 }
 
+void StyleResolver::resetMediaQueryAffectedByViewportChange()
+{
+    m_viewportDependentMediaQueryResults.clear();
+}
+
+void StyleResolver::addMediaQueryAffectedByViewportChange(const MediaQueryResultList& list)
+{
+    m_viewportDependentMediaQueryResults.appendVector(list);
+}
+
 bool StyleResolver::mediaQueryAffectedByViewportChange() const
 {
     for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
         if (m_medium->eval(m_viewportDependentMediaQueryResults[i]->expression()) != m_viewportDependentMediaQueryResults[i]->result())
             return true;
     }
     return false;
 }
 
 } // namespace blink