Merge StyleSheetCollection into ScopedStyleResolver.

sky/engine/core/dom/StyleEngine.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 17 matching lines @@
 #include "sky/engine/config.h"
 #include "sky/engine/core/dom/StyleEngine.h"
 
 #include "sky/engine/core/css/CSSFontSelector.h"
 #include "sky/engine/core/css/CSSStyleSheet.h"
 #include "sky/engine/core/css/FontFaceCache.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/core/dom/Document.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/dom/ElementTraversal.h"
-#include "sky/engine/core/dom/StyleSheetCollection.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/frame/Settings.h"
 #include "sky/engine/core/html/HTMLStyleElement.h"
 #include "sky/engine/core/html/imports/HTMLImportsController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/RenderView.h"
 
 namespace blink {
 
 StyleEngine::StyleEngine(Document& document)
@@ skipping 19 matching lines @@
 void StyleEngine::removeTreeScope(TreeScope& scope)
 {
     m_activeTreeScopes.remove(&scope);
 }
 
 void StyleEngine::updateActiveStyleSheets()
 {
     ASSERT(!m_document->inStyleRecalc());
     ASSERT(m_resolver);
 
+    StyleResolver& resolver = m_document->ensureStyleResolver();
+
+    resolver.resetMediaQueryAffectedByViewportChange();
+
     for (TreeScope* treeScope : m_activeTreeScopes)
-        treeScope->styleSheets().updateActiveStyleSheets(*m_resolver);
+        treeScope->scopedStyleResolver().updateActiveStyleSheets();
 
     m_document->renderView()->style()->font().update(fontSelector());
 }
 
 void StyleEngine::resolverChanged()
 {
     if (!m_document->isActive())
         return;
     updateActiveStyleSheets();
 }
@@ skipping 47 matching lines @@
     m_sheetToTextCache.remove(contents);
 }
 
 void StyleEngine::fontsNeedUpdate(CSSFontSelector*)
 {
     m_resolver->invalidateMatchedPropertiesCache();
     m_document->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 }