Merge StyleSheetCollection into ScopedStyleResolver.

sky/engine/core/dom/StyleEngine.cpp

Index: sky/engine/core/dom/StyleEngine.cpp
diff --git a/sky/engine/core/dom/StyleEngine.cpp b/sky/engine/core/dom/StyleEngine.cpp
index a38b3dc12187f50b858b5e790165421b88faa9ec..fedaeb6e2566a1d6a35eeab188006306045a1bb2 100644
--- a/sky/engine/core/dom/StyleEngine.cpp
+++ b/sky/engine/core/dom/StyleEngine.cpp
@@ -35,7 +35,6 @@
 #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"
@@ -75,8 +74,12 @@ 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());
 }