Have LiveNodeList::rootNode() return a reference

Source/core/dom/LiveNodeList.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 11 matching lines @@
 
 #include "config.h"
 #include "core/dom/LiveNodeList.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/html/HTMLCollection.h"
 
 namespace WebCore {
 
-Node* LiveNodeListBase::rootNode() const
+Node& LiveNodeListBase::rootNode() const
 {
     if (isRootedAtDocument() && m_ownerNode->inDocument())
-        return &m_ownerNode->document();
-    return m_ownerNode.get();
+        return m_ownerNode->document();
+    return *m_ownerNode;
 }
 
 ContainerNode* LiveNodeListBase::rootContainerNode() const
 {
-    Node* rootNode = this->rootNode();
-    if (!rootNode->isContainerNode())
+    Node& rootNode = this->rootNode();
+    if (!rootNode.isContainerNode())
         return 0;
-    return toContainerNode(rootNode);
+    return toContainerNode(&rootNode);
 }
 
 void LiveNodeListBase::invalidateCache() const
 {
     m_cachedItem = 0;
     m_isLengthCacheValid = false;
     m_isItemCacheValid = false;
     m_isNameCacheValid = false;
     m_isItemRefElementsCacheValid = false;
     if (isNodeList(type()))
         return;
 
     const HTMLCollection* cacheBase = static_cast<const HTMLCollection*>(this);
     cacheBase->m_idCache.clear();
     cacheBase->m_nameCache.clear();
     cacheBase->m_cachedElementsArrayOffset = 0;
 }
 
 void LiveNodeListBase::invalidateIdNameCacheMaps() const
 {
     ASSERT(hasIdNameCache());
     const HTMLCollection* cacheBase = static_cast<const HTMLCollection*>(this);
     cacheBase->m_idCache.clear();
     cacheBase->m_nameCache.clear();
 }
 
 Node* LiveNodeList::namedItem(const AtomicString& elementId) const
 {
-    Node* rootNode = this->rootNode();
+    Node& rootNode = this->rootNode();
 
-    if (rootNode->inDocument()) {
-        Element* element = rootNode->treeScope().getElementById(elementId);
-        if (element && nodeMatches(element) && element->isDescendantOf(rootNode))
+    if (rootNode.inDocument()) {
+        Element* element = rootNode.treeScope().getElementById(elementId);
+        if (element && nodeMatches(element) && element->isDescendantOf(&rootNode))
             return element;
         if (!element)
             return 0;
         // In the case of multiple nodes with the same name, just fall through.
     }
 
     unsigned length = this->length();
     for (unsigned i = 0; i < length; i++) {
         Node* node = item(i);
         // FIXME: This should probably be using getIdAttribute instead of idForStyleResolution.
         if (node->hasID() && toElement(node)->idForStyleResolution() == elementId)
             return node;
     }
 
     return 0;
 }
 
 } // namespace WebCore