WIP (Introduce WTF::NonNullPtr<T>.)

Source/core/dom/StyleSheetCollections.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 79 matching lines @@
     if (treeScopes.contains(treeScope))
         return;
 
     TreeScopeSet::iterator begin = treeScopes.begin();
     TreeScopeSet::iterator end = treeScopes.end();
     TreeScopeSet::iterator it = end;
     TreeScope* followingTreeScope = 0;
     do {
         --it;
         TreeScope* n = *it;
-        unsigned short position = n->comparePosition(*treeScope);
+        unsigned short position = n->comparePosition(treeScope);
         if (position & Node::DOCUMENT_POSITION_FOLLOWING) {
             treeScopes.insertBefore(followingTreeScope, treeScope);
             return;
         }
         followingTreeScope = n;
     } while (it != begin);
 
     treeScopes.insertBefore(followingTreeScope, treeScope);
 }
 
-StyleSheetCollection* StyleSheetCollections::ensureStyleSheetCollectionFor(TreeScope& treeScope)
+StyleSheetCollection* StyleSheetCollections::ensureStyleSheetCollectionFor(NonNullPtr<TreeScope> treeScope)
 {
-    if (&treeScope == &m_document)
+    if (treeScope == &m_document)
         return &m_documentStyleSheetCollection;
 
-    HashMap<TreeScope*, OwnPtr<StyleSheetCollection> >::AddResult result = m_styleSheetCollectionMap.add(&treeScope, nullptr);
+    HashMap<TreeScope*, OwnPtr<StyleSheetCollection> >::AddResult result = m_styleSheetCollectionMap.add(treeScope.get(), nullptr);
     if (result.isNewEntry)
-        result.iterator->value = adoptPtr(new ShadowTreeStyleSheetCollection(toShadowRoot(treeScope)));
+        result.iterator->value = adoptPtr(new ShadowTreeStyleSheetCollection(*toShadowRoot(treeScope.get())));
     return result.iterator->value.get();
 }
 
-StyleSheetCollection* StyleSheetCollections::styleSheetCollectionFor(TreeScope& treeScope)
+StyleSheetCollection* StyleSheetCollections::styleSheetCollectionFor(NonNullPtr<TreeScope> treeScope)
 {
-    if (&treeScope == &m_document)
+    if (treeScope == &m_document)
         return &m_documentStyleSheetCollection;
 
-    HashMap<TreeScope*, OwnPtr<StyleSheetCollection> >::iterator it = m_styleSheetCollectionMap.find(&treeScope);
+    HashMap<TreeScope*, OwnPtr<StyleSheetCollection> >::iterator it = m_styleSheetCollectionMap.find(treeScope.get());
     if (it == m_styleSheetCollectionMap.end())
         return 0;
     return it->value.get();
 }
 
 const Vector<RefPtr<StyleSheet> >& StyleSheetCollections::styleSheetsForStyleSheetList()
 {
     return m_documentStyleSheetCollection.styleSheetsForStyleSheetList();
 }
 
@@ skipping 134 matching lines @@
 }
 
 // This method is called whenever a top-level stylesheet has finished loading.
 void StyleSheetCollections::removePendingSheet(Node* styleSheetCandidateNode, RemovePendingSheetNotificationType notification)
 {
     // Make sure we knew this sheet was pending, and that our count isn't out of sync.
     ASSERT(m_pendingStylesheets > 0);
 
     m_pendingStylesheets--;
 
-    TreeScope* treeScope = isHTMLStyleElement(styleSheetCandidateNode) ? &styleSheetCandidateNode->treeScope() : &m_document;
+    NonNullPtr<TreeScope> treeScope = isHTMLStyleElement(styleSheetCandidateNode) ? styleSheetCandidateNode->treeScope() : &m_document;
     if (treeScope == &m_document)
         m_needsDocumentStyleSheetsUpdate = true;
     else
-        m_dirtyTreeScopes.add(treeScope);
+        m_dirtyTreeScopes.add(treeScope.get());
 
     if (m_pendingStylesheets)
         return;
 
     if (notification == RemovePendingSheetNotifyLater) {
         m_document.setNeedsNotifyRemoveAllPendingStylesheet();
         return;
     }
 
     // FIXME: We can't call addedStyleSheet or removedStyleSheet here because we don't know
     // what's new. We should track that to tell the style system what changed.
     m_document.didRemoveAllPendingStylesheet();
 }
 
 void StyleSheetCollections::addStyleSheetCandidateNode(Node* node, bool createdByParser)
 {
     if (!node->inDocument())
         return;
 
-    TreeScope& treeScope = isHTMLStyleElement(node) ? node->treeScope() : m_document;
-    ASSERT(isHTMLStyleElement(node) || &treeScope == &m_document);
+    NonNullPtr<TreeScope> treeScope = isHTMLStyleElement(node) ? node->treeScope() : &m_document;
+    ASSERT(isHTMLStyleElement(node) || treeScope == &m_document);
 
     StyleSheetCollection* collection = ensureStyleSheetCollectionFor(treeScope);
     ASSERT(collection);
     collection->addStyleSheetCandidateNode(node, createdByParser);
 
-    if (&treeScope == &m_document) {
+    if (treeScope == &m_document) {
         m_needsDocumentStyleSheetsUpdate = true;
         return;
     }
 
-    insertTreeScopeInDocumentOrder(m_activeTreeScopes, &treeScope);
-    m_dirtyTreeScopes.add(&treeScope);
+    insertTreeScopeInDocumentOrder(m_activeTreeScopes, treeScope.get());
+    m_dirtyTreeScopes.add(treeScope.get());
 }
 
 void StyleSheetCollections::removeStyleSheetCandidateNode(Node* node, ContainerNode* scopingNode)
 {
-    TreeScope& treeScope = scopingNode ? scopingNode->treeScope() : m_document;
-    ASSERT(isHTMLStyleElement(node) || &treeScope == &m_document);
+    NonNullPtr<TreeScope> treeScope = scopingNode ? scopingNode->treeScope() : &m_document;
+    ASSERT(isHTMLStyleElement(node) || treeScope == &m_document);
 
     StyleSheetCollection* collection = styleSheetCollectionFor(treeScope);
     ASSERT(collection);
     collection->removeStyleSheetCandidateNode(node, scopingNode);
 
-    if (&treeScope == &m_document) {
+    if (treeScope == &m_document) {
         m_needsDocumentStyleSheetsUpdate = true;
         return;
     }
-    m_dirtyTreeScopes.add(&treeScope);
-    m_activeTreeScopes.remove(&treeScope);
+    m_dirtyTreeScopes.add(treeScope.get());
+    m_activeTreeScopes.remove(treeScope.get());
 }
 
 void StyleSheetCollections::modifiedStyleSheetCandidateNode(Node* node)
 {
     if (!node->inDocument())
         return;
 
-    TreeScope& treeScope = isHTMLStyleElement(node) ? node->treeScope() : m_document;
-    ASSERT(isHTMLStyleElement(node) || &treeScope == &m_document);
-    if (&treeScope == &m_document) {
+    NonNullPtr<TreeScope> treeScope = isHTMLStyleElement(node) ? node->treeScope() : &m_document;
+    ASSERT(isHTMLStyleElement(node) || treeScope == &m_document);
+    if (treeScope == &m_document) {
         m_needsDocumentStyleSheetsUpdate = true;
         return;
     }
-    m_dirtyTreeScopes.add(&treeScope);
+    m_dirtyTreeScopes.add(treeScope.get());
 }
 
 bool StyleSheetCollections::shouldUpdateShadowTreeStyleSheetCollection(StyleResolverUpdateMode updateMode)
 {
     return !m_dirtyTreeScopes.isEmpty() || updateMode == FullStyleUpdate;
 }
 
 bool StyleSheetCollections::updateActiveStyleSheets(StyleResolverUpdateMode updateMode)
 {
     if (m_document.inStyleRecalc()) {
         // SVG <use> element may manage to invalidate style selector in the middle of a style recalc.
         // https://bugs.webkit.org/show_bug.cgi?id=54344
         // FIXME: This should be fixed in SVG and the call site replaced by ASSERT(!m_inStyleRecalc).
         m_needsUpdateActiveStylesheetsOnStyleRecalc = true;
         return false;
 
     }
     if (!m_document.renderer() || !m_document.attached())
         return false;
 
     bool requiresFullStyleRecalc = false;
     if (m_needsDocumentStyleSheetsUpdate || updateMode == FullStyleUpdate)
         requiresFullStyleRecalc = m_documentStyleSheetCollection.updateActiveStyleSheets(this, updateMode);
 
     if (shouldUpdateShadowTreeStyleSheetCollection(updateMode)) {
         TreeScopeSet treeScopes = updateMode == FullStyleUpdate ? m_activeTreeScopes : m_dirtyTreeScopes;
         HashSet<TreeScope*> treeScopesRemoved;
 
         for (TreeScopeSet::iterator it = treeScopes.begin(); it != treeScopes.end(); ++it) {
-            TreeScope* treeScope = *it;
+            NonNullPtr<TreeScope> treeScope(*it);
             ASSERT(treeScope != &m_document);
-            ShadowTreeStyleSheetCollection* collection = static_cast<ShadowTreeStyleSheetCollection*>(styleSheetCollectionFor(*treeScope));
+            ShadowTreeStyleSheetCollection* collection = static_cast<ShadowTreeStyleSheetCollection*>(styleSheetCollectionFor(treeScope));
             ASSERT(collection);
             collection->updateActiveStyleSheets(this, updateMode);
             if (!collection->hasStyleSheetCandidateNodes())
-                treeScopesRemoved.add(treeScope);
+                treeScopesRemoved.add(treeScope.get());
         }
         if (!treeScopesRemoved.isEmpty())
             for (HashSet<TreeScope*>::iterator it = treeScopesRemoved.begin(); it != treeScopesRemoved.end(); ++it)
                 m_activeTreeScopes.remove(*it);
         m_dirtyTreeScopes.clear();
     }
 
     if (StyleResolver* styleResolver = m_document.styleResolverIfExists()) {
         styleResolver->finishAppendAuthorStyleSheets();
         resetCSSFeatureFlags(styleResolver->ruleFeatureSet());
@@ skipping 52 matching lines @@
         if (StyleSheetCollection* collection = m_styleSheetCollectionMap.get(*it)) {
             styleResolver->setBuildScopedStyleTreeInDocumentOrder(!collection->scopingNodesForStyleScoped());
             styleResolver->appendAuthorStyleSheets(0, collection->activeAuthorStyleSheets());
         }
     }
     styleResolver->finishAppendAuthorStyleSheets();
     styleResolver->setBuildScopedStyleTreeInDocumentOrder(false);
 }
 
 }