Changeset 164251 in webkit

Timestamp:

Feb 17, 2014 3:29:31 PM (10 years ago)

Author:

Antti Koivisto

Message:

Make TreeScope::rootNode return a reference
​https://bugs.webkit.org/show_bug.cgi?id=128934

Reviewed by Andreas Kling.

It is never null.

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::collectMatchingRules):

• dom/ContainerNode.h:

(WebCore::Node::isTreeScope):

• dom/Document.cpp:

(WebCore::Document::buildAccessKeyMap):

• dom/DocumentOrderedMap.cpp:

(WebCore::DocumentOrderedMap::add):
(WebCore::DocumentOrderedMap::get):
(WebCore::DocumentOrderedMap::getAllElementsById):

• dom/EventDispatcher.cpp:

(WebCore::EventRelatedNodeResolver::moveToParentOrShadowHost):
(WebCore::eventTargetRespectingTargetRules):
(WebCore::shouldEventCrossShadowBoundary):

• dom/Node.cpp:

(WebCore::Node::containingShadowRoot):
(WebCore::Node::removedFrom):

• dom/ShadowRoot.h:

(WebCore::isShadowRoot):

• dom/TreeScope.h:

(WebCore::TreeScope::rootNode):

• page/DOMSelection.cpp:

(WebCore::DOMSelection::DOMSelection):

• page/DragController.cpp:

(WebCore::asFileInput):

• page/FocusController.cpp:

(WebCore::FocusNavigationScope::rootNode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/ElementRuleCollector.cpp (modified) (1 diff)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/DocumentOrderedMap.cpp (modified) (3 diffs)
• dom/EventDispatcher.cpp (modified) (3 diffs)
• dom/Node.cpp (modified) (2 diffs)
• dom/ShadowRoot.h (modified) (1 diff)
• dom/TreeScope.cpp (modified) (9 diffs)
• dom/TreeScope.h (modified) (1 diff)
• editing/VisibleSelection.cpp (modified) (2 diffs)
• page/DOMSelection.cpp (modified) (1 diff)
• page/DragController.cpp (modified) (1 diff)
• page/FocusController.cpp (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• testing/Internals.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-17  Antti Koivisto  <antti@apple.com>
+
+        Make TreeScope::rootNode return a reference
+        https://bugs.webkit.org/show_bug.cgi?id=128934
+
+        Reviewed by Andreas Kling.
+
+        It is never null.
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::collectMatchingRules):
+        * dom/ContainerNode.h:
+        (WebCore::Node::isTreeScope):
+        * dom/Document.cpp:
+        (WebCore::Document::buildAccessKeyMap):
+        * dom/DocumentOrderedMap.cpp:
+        (WebCore::DocumentOrderedMap::add):
+        (WebCore::DocumentOrderedMap::get):
+        (WebCore::DocumentOrderedMap::getAllElementsById):
+        * dom/EventDispatcher.cpp:
+        (WebCore::EventRelatedNodeResolver::moveToParentOrShadowHost):
+        (WebCore::eventTargetRespectingTargetRules):
+        (WebCore::shouldEventCrossShadowBoundary):
+        * dom/Node.cpp:
+        (WebCore::Node::containingShadowRoot):
+        (WebCore::Node::removedFrom):
+        * dom/ShadowRoot.h:
+        (WebCore::isShadowRoot):
+        * dom/TreeScope.h:
+        (WebCore::TreeScope::rootNode):
+        * page/DOMSelection.cpp:
+        (WebCore::DOMSelection::DOMSelection):
+        * page/DragController.cpp:
+        (WebCore::asFileInput):
+        * page/FocusController.cpp:
+        (WebCore::FocusNavigationScope::rootNode):
+
 2014-02-17  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -156 +156 @@
 #endif
     // Only match UA rules in shadow tree.
-    if (!MatchingUARulesScope::isMatchingUARules() && m_element.treeScope().rootNode()->isShadowRoot())
+    if (!MatchingUARulesScope::isMatchingUARules() && m_element.treeScope().rootNode().isShadowRoot())
         return;
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -237 +237 @@
 inline bool Node::isTreeScope() const
 {
-    return treeScope().rootNode() == this;
+    return &treeScope().rootNode() == this;
 }
 

trunk/Source/WebCore/dom/Document.cpp

@@ -713 +713 @@
 {
     ASSERT(scope);
-    ContainerNode* rootNode = scope->rootNode();
-    for (auto& element : descendantsOfType<Element>(*rootNode)) {
+    for (auto& element : descendantsOfType<Element>(scope->rootNode())) {
         const AtomicString& accessKey = element.fastGetAttribute(accesskeyAttr);
         if (!accessKey.isEmpty())

trunk/Source/WebCore/dom/DocumentOrderedMap.cpp

@@ -92 +92 @@
     UNUSED_PARAM(treeScope);
     ASSERT_WITH_SECURITY_IMPLICATION(element.isInTreeScope());
-    ASSERT_WITH_SECURITY_IMPLICATION(treeScope.rootNode()->containsIncludingShadowDOM(&element));
+    ASSERT_WITH_SECURITY_IMPLICATION(treeScope.rootNode().containsIncludingShadowDOM(&element));
     if (!element.isInTreeScope())
         return;
@@ -145 +145 @@
 
     // We know there's at least one node that matches; iterate to find the first one.
-    for (auto& element : descendantsOfType<Element>(*scope.rootNode())) {
+    for (auto& element : descendantsOfType<Element>(scope.rootNode())) {
         if (!keyMatches(key, element))
             continue;
@@ -212 +212 @@
     if (entry.orderedList.isEmpty()) {
         entry.orderedList.reserveCapacity(entry.count);
-        auto elementDescandents = descendantsOfType<Element>(*scope.rootNode());
+        auto elementDescandents = descendantsOfType<Element>(scope.rootNode());
         auto it = entry.element ? elementDescandents.beginAt(*entry.element) : elementDescandents.begin();
         auto end = elementDescandents.end();

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -144 +144 @@
 
         if (m_currentTreeScope) {
-            ASSERT(m_currentTreeScope->rootNode()->isShadowRoot());
-            ASSERT(&newTarget == toShadowRoot(m_currentTreeScope->rootNode())->hostElement());
+            ASSERT(m_currentTreeScope->rootNode().isShadowRoot());
+            ASSERT(&newTarget == toShadowRoot(m_currentTreeScope->rootNode()).hostElement());
             ASSERT(m_currentTreeScope->parentTreeScope() == &newTreeScope);
         }
@@ -185 +185 @@
     // Spec: The event handling for the non-exposed tree works as if the referenced element had been textually included
     // as a deeply cloned child of the 'use' element, except that events are dispatched to the SVGElementInstance objects
-    Node* rootNode = referenceNode.treeScope().rootNode();
-    Element* shadowHostElement = rootNode->isShadowRoot() ? toShadowRoot(rootNode)->hostElement() : 0;
+    auto& rootNode = referenceNode.treeScope().rootNode();
+    Element* shadowHostElement = rootNode.isShadowRoot() ? toShadowRoot(rootNode).hostElement() : nullptr;
     // At this time, SVG nodes are not supported in non-<use> shadow trees.
     if (!shadowHostElement || !shadowHostElement->hasTagName(SVGNames::useTag))
@@ -367 +367 @@
     // See https://bugs.webkit.org/show_bug.cgi?id=52195 for details.
     const AtomicString& eventType = event.type();
-    bool targetIsInShadowRoot = targetNode && targetNode->treeScope().rootNode() == &shadowRoot;
+    bool targetIsInShadowRoot = targetNode && &targetNode->treeScope().rootNode() == &shadowRoot;
     return !targetIsInShadowRoot
         || !(eventType == eventNames().abortEvent

trunk/Source/WebCore/dom/Node.cpp

@@ -952 +952 @@
 ShadowRoot* Node::containingShadowRoot() const
 {
-    ContainerNode* root = treeScope().rootNode();
-    return root && root->isShadowRoot() ? toShadowRoot(root) : 0;
+    ContainerNode& root = treeScope().rootNode();
+    return root.isShadowRoot() ? toShadowRoot(&root) : nullptr;
 }
 
@@ -1012 +1012 @@
     if (insertionPoint.inDocument())
         clearFlag(InDocumentFlag);
-    if (isInShadowTree() && !treeScope().rootNode()->isShadowRoot())
+    if (isInShadowTree() && !treeScope().rootNode().isShadowRoot())
         clearFlag(IsInShadowTreeFlag);
 }

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -96 +96 @@
 }
 
-inline const ShadowRoot* toShadowRoot(const Node* node)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isShadowRoot());
-    return static_cast<const ShadowRoot*>(node);
-}
+inline bool isShadowRoot(const Node& node) { return node.isShadowRoot(); }
 
-inline ShadowRoot* toShadowRoot(Node* node)
-{
-    return const_cast<ShadowRoot*>(toShadowRoot(static_cast<const Node*>(node)));
-}
+NODE_TYPE_CASTS(ShadowRoot)
 
 inline ShadowRoot* Node::shadowRoot() const

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -93 +93 @@
 {
     // A document node cannot be re-parented.
-    ASSERT(!rootNode()->isDocumentNode());
+    ASSERT(!m_rootNode.isDocumentNode());
     // Every scope other than document needs a parent scope.
     ASSERT(newParentScope);
@@ -199 +199 @@
     if (name.isEmpty())
         return nullptr;
-    if (rootNode()->document().isHTMLDocument()) {
+    if (m_rootNode.document().isHTMLDocument()) {
         AtomicString lowercasedName = name.lower();
         return m_imageMapsByName->getElementByLowercasedMapName(*lowercasedName.impl(), *this);
@@ -240 +240 @@
 Element* TreeScope::elementFromPoint(int x, int y) const
 {
-    Node* node = nodeFromPoint(&rootNode()->document(), x, y);
+    Node* node = nodeFromPoint(&m_rootNode.document(), x, y);
     while (node && !node->isElementNode())
         node = node->parentNode();
@@ -269 +269 @@
         m_labelsByForAttribute = std::make_unique<DocumentOrderedMap>();
 
-        for (auto& label : descendantsOfType<HTMLLabelElement>(*rootNode())) {
+        for (auto& label : descendantsOfType<HTMLLabelElement>(m_rootNode)) {
             const AtomicString& forValue = label.fastGetAttribute(forAttr);
             if (!forValue.isEmpty())
@@ -281 +281 @@
 DOMSelection* TreeScope::getSelection() const
 {
-    if (!rootNode()->document().frame())
+    if (!m_rootNode.document().frame())
         return nullptr;
 
@@ -287 +287 @@
         return m_selection.get();
 
-    if (this != &rootNode()->document())
-        return rootNode()->document().getSelection();
-
-    m_selection = DOMSelection::create(&rootNode()->document());
+    if (this != &m_rootNode.document())
+        return m_rootNode.document().getSelection();
+
+    m_selection = DOMSelection::create(&m_rootNode.document());
     return m_selection.get();
 }
@@ -300 +300 @@
     if (Element* element = getElementById(name))
         return element;
-    for (auto& anchor : descendantsOfType<HTMLAnchorElement>(*rootNode())) {
-        if (rootNode()->document().inQuirksMode()) {
+    for (auto& anchor : descendantsOfType<HTMLAnchorElement>(m_rootNode)) {
+        if (m_rootNode.document().inQuirksMode()) {
             // Quirks mode, case insensitive comparison of names.
             if (equalIgnoringCase(anchor.name(), name))
@@ -336 +336 @@
 Element* TreeScope::focusedElement()
 {
-    Document& document = rootNode()->document();
+    Document& document = m_rootNode.document();
     Element* element = document.focusedElement();
 
@@ -345 +345 @@
     TreeScope* treeScope = &element->treeScope();
     while (treeScope != this && treeScope != &document) {
-        element = toShadowRoot(treeScope->rootNode())->hostElement();
+        element = toShadowRoot(treeScope->rootNode()).hostElement();
         treeScope = &element->treeScope();
     }

trunk/Source/WebCore/dom/TreeScope.h

@@ -96 +96 @@
     void adoptIfNeeded(Node*);
 
-    ContainerNode* rootNode() const { return &m_rootNode; }
+    ContainerNode& rootNode() const { return m_rootNode; }
 
     IdTargetObserverRegistry& idTargetObserverRegistry() const { return *m_idTargetObserverRegistry.get(); }

trunk/Source/WebCore/editing/VisibleSelection.cpp

@@ -486 +486 @@
     }
 
-    if (Node* lastChild = treeScope.rootNode()->lastChild())
+    if (Node* lastChild = treeScope.rootNode().lastChild())
         return positionAfterNode(lastChild);
 
@@ -504 +504 @@
     }
 
-    if (Node* firstChild = treeScope.rootNode()->firstChild())
+    if (Node* firstChild = treeScope.rootNode().firstChild())
         return positionBeforeNode(firstChild);
 

trunk/Source/WebCore/page/DOMSelection.cpp

@@ -58 +58 @@
 
 DOMSelection::DOMSelection(const TreeScope* treeScope)
-    : DOMWindowProperty(treeScope->rootNode()->document().frame())
+    : DOMWindowProperty(treeScope->rootNode().document().frame())
     , m_treeScope(treeScope)
 {

trunk/Source/WebCore/page/DragController.cpp

@@ -273 +273 @@
 
     // If this is a button inside of the a file input, move up to the file input.
-    if (inputElement && inputElement->isTextButton() && inputElement->treeScope().rootNode()->isShadowRoot())
-        inputElement = toShadowRoot(inputElement->treeScope().rootNode())->hostElement()->toInputElement();
+    if (inputElement && inputElement->isTextButton() && inputElement->treeScope().rootNode().isShadowRoot())
+        inputElement = toShadowRoot(inputElement->treeScope().rootNode()).hostElement()->toInputElement();
 
     return inputElement && inputElement->isFileUpload() ? inputElement : 0;

trunk/Source/WebCore/page/FocusController.cpp

@@ -75 +75 @@
 ContainerNode* FocusNavigationScope::rootNode() const
 {
-    return m_rootTreeScope->rootNode();
+    return &m_rootTreeScope->rootNode();
 }
 

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -948 +948 @@
     // Walk up the tree, to find out whether we're inside a <use> shadow tree, to find the right title.
     if (isInShadowTree()) {
-        Element* shadowHostElement = toShadowRoot(treeScope().rootNode())->hostElement();
+        Element* shadowHostElement = toShadowRoot(treeScope().rootNode()).hostElement();
         // At this time, SVG nodes are not allowed in non-<use> shadow trees, so any shadow root we do
         // have should be a use. The assert and following test is here to catch future shadow DOM changes

trunk/Source/WebCore/testing/Internals.cpp

@@ -366 +366 @@
     if (!node) {
         ec = INVALID_ACCESS_ERR;
-        return 0;
-    }
-
-    return node->treeScope().rootNode();
+        return nullptr;
+    }
+
+    return &node->treeScope().rootNode();
 }
 
@@ -376 +376 @@
     if (!node) {
         ec = INVALID_ACCESS_ERR;
-        return 0;
+        return nullptr;
     }
     const TreeScope* parentTreeScope = node->treeScope().parentTreeScope();
-    return parentTreeScope ? parentTreeScope->rootNode() : 0;
+    return parentTreeScope ? &parentTreeScope->rootNode() : nullptr;
 }