Remove global set of ScopedStyleResolvers.

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 36 matching lines @@
 #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)
-#if !ENABLE(OILPAN)
+    , m_scopedStyleResolver(ScopedStyleResolver::create(*this))
     , m_guardRefCount(0)
-#endif
 {
     ASSERT(rootNode != document);
 #if !ENABLE(OILPAN)
     m_parentTreeScope->guardRef();
 #endif
     m_rootNode->setTreeScope(this);
 }
 
 TreeScope::TreeScope(Document& document)
     : m_rootNode(document)
     , m_document(&document)
     , m_parentTreeScope(nullptr)
-#if !ENABLE(OILPAN)
+    , m_scopedStyleResolver(ScopedStyleResolver::create(*this))
     , m_guardRefCount(0)
-#endif
 {
     m_rootNode->setTreeScope(this);
 }
 
 TreeScope::~TreeScope()
 {
-#if !ENABLE(OILPAN)
     ASSERT(!m_guardRefCount);
     m_rootNode->setTreeScope(0);
 
     if (m_selection) {
         m_selection->clearTreeScope();
         m_selection = nullptr;
     }
 
     if (m_parentTreeScope)
         m_parentTreeScope->guardDeref();
-#endif
 }
 
 bool TreeScope::isInclusiveOlderSiblingShadowRootOrAncestorTreeScopeOf(const TreeScope& scope) const
 {
     for (const TreeScope* current = &scope; current; current = current->parentTreeScope()) {
         if (current == this)
             return true;
     }
     return false;
 }
@@ skipping 19 matching lines @@
 
 #if !ENABLE(OILPAN)
     newParentScope.guardRef();
     if (m_parentTreeScope)
         m_parentTreeScope->guardDeref();
 #endif
     m_parentTreeScope = &newParentScope;
     setDocument(newParentScope.document());
 }
 
-ScopedStyleResolver& TreeScope::ensureScopedStyleResolver()
-{
-    RELEASE_ASSERT(this);
-    if (!m_scopedStyleResolver)
-        m_scopedStyleResolver = ScopedStyleResolver::create(*this);
-    return *m_scopedStyleResolver;
-}
-
-void TreeScope::clearScopedStyleResolver()
-{
-    m_scopedStyleResolver.clear();
-}
-
 Element* TreeScope::getElementById(const AtomicString& elementId) const
 {
     if (elementId.isEmpty())
         return 0;
     if (!m_elementsById)
         return 0;
     return m_elementsById->getElementById(elementId, this);
 }
 
 void TreeScope::addElementById(const AtomicString& elementId, Element* element)
@@ skipping 277 matching lines @@
 
     for (size_t i = 0; i < list.size(); i++) {
         if (list[i]->contents() != otherList[i]->contents())
             return false;
     }
 
     return true;
 }
 
 } // namespace blink