Merge StyleSheetCollection into ScopedStyleResolver.

sky/engine/core/dom/TreeScope.cpp

 /*
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 16 matching lines @@
 #include "sky/engine/config.h"
 #include "sky/engine/core/dom/TreeScope.h"
 
 #include "gen/sky/core/HTMLNames.h"
 #include "sky/engine/core/css/resolver/ScopedStyleResolver.h"
 #include "sky/engine/core/dom/ContainerNode.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/NodeRenderStyle.h"
-#include "sky/engine/core/dom/StyleSheetCollection.h"
 #include "sky/engine/core/dom/TreeScopeAdopter.h"
 #include "sky/engine/core/dom/shadow/ElementShadow.h"
 #include "sky/engine/core/dom/shadow/ShadowRoot.h"
 #include "sky/engine/core/editing/DOMSelection.h"
 #include "sky/engine/core/events/EventPath.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/html/HTMLAnchorElement.h"
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/HitTestResult.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/wtf/Vector.h"
 
 namespace blink {
 
 TreeScope::TreeScope(ContainerNode& rootNode, Document& document)
     : m_rootNode(&rootNode)
     , m_document(&document)
     , m_parentTreeScope(&document)
     , m_scopedStyleResolver(ScopedStyleResolver::create(*this))
-    , m_styleSheets(StyleSheetCollection::create(*this))
     , m_guardRefCount(0)
 {
     ASSERT(rootNode != document);
     m_parentTreeScope->guardRef();
     m_rootNode->setTreeScope(this);
 }
 
 TreeScope::TreeScope(Document& document)
     : m_rootNode(document)
     , m_document(&document)
     , m_parentTreeScope(nullptr)
     , m_scopedStyleResolver(ScopedStyleResolver::create(*this))
-    , m_styleSheets(StyleSheetCollection::create(*this))
     , m_guardRefCount(0)
 {
     m_rootNode->setTreeScope(this);
 }
 
 TreeScope::~TreeScope()
 {
     ASSERT(!m_guardRefCount);
     m_rootNode->setTreeScope(0);
 
@@ skipping 313 matching lines @@
         RenderStyle* style = element->renderStyle();
         if (style && style->hasViewportUnits())
             element->setNeedsStyleRecalc(LocalStyleChange);
     }
 }
 
 bool TreeScope::hasSameStyles(TreeScope& other)
 {
     if (this == &other)
         return true;
-    const Vector<RefPtr<blink::CSSStyleSheet> >& list = styleSheets().activeAuthorStyleSheets();
-    const Vector<RefPtr<blink::CSSStyleSheet> >& otherList = other.styleSheets().activeAuthorStyleSheets();
+    const Vector<RefPtr<blink::CSSStyleSheet> >& list = scopedStyleResolver().authorStyleSheets();
+    const Vector<RefPtr<blink::CSSStyleSheet> >& otherList = other.scopedStyleResolver().authorStyleSheets();
 
     if (list.size() != otherList.size())
         return false;
 
     for (size_t i = 0; i < list.size(); i++) {
         if (list[i]->contents() != otherList[i]->contents())
             return false;
     }
 
     return true;
 }
 
 } // namespace blink