Changeset 155303 in webkit

Timestamp:

Sep 8, 2013 4:30:17 AM (11 years ago)

Author:

Antti Koivisto

Message:

Rename needsShadowTreeWalker
​https://bugs.webkit.org/show_bug.cgi?id=121005

Reviewed by Andreas Kling.

Rename to needsNodeRenderingTraversalSlowPath.

• dom/ContainerNode.h:

(WebCore::Node::needsNodeRenderingTraversalSlowPath):

• dom/Element.cpp:

(WebCore::shouldUseNodeRenderingTraversalSlowPath):
(WebCore::Element::resetNeedsNodeRenderingTraversalSlowPath):

Only Elements can have this flag. Move the code here from Node.

(WebCore::Element::addShadowRoot):
(WebCore::Element::setBeforePseudoElement):
(WebCore::Element::setAfterPseudoElement):
(WebCore::Element::clearBeforePseudoElement):
(WebCore::Element::clearAfterPseudoElement):

Reset after clear too.

• dom/Element.h:
• dom/Element.h:
• dom/Node.cpp:
• dom/Node.h:

(WebCore::Node::isInsertionPoint):
(WebCore::Node::setNeedsNodeRenderingTraversalSlowPath):

Make protected.

• dom/NodeRenderingTraversal.h:

(WebCore::NodeRenderingTraversal::parent):
(WebCore::NodeRenderingTraversal::nextSibling):
(WebCore::NodeRenderingTraversal::previousSibling):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Element.cpp (modified) (6 diffs)
• dom/Element.h (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (5 diffs)
• dom/NodeRenderingTraversal.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-08  Antti Koivisto  <antti@apple.com>
+
+        Rename needsShadowTreeWalker
+        https://bugs.webkit.org/show_bug.cgi?id=121005
+
+        Reviewed by Andreas Kling.
+
+        Rename to needsNodeRenderingTraversalSlowPath.
+
+        * dom/ContainerNode.h:
+        (WebCore::Node::needsNodeRenderingTraversalSlowPath):
+        * dom/Element.cpp:
+        (WebCore::shouldUseNodeRenderingTraversalSlowPath):
+        (WebCore::Element::resetNeedsNodeRenderingTraversalSlowPath):
+
+            Only Elements can have this flag. Move the code here from Node.
+
+        (WebCore::Element::addShadowRoot):
+        (WebCore::Element::setBeforePseudoElement):
+        (WebCore::Element::setAfterPseudoElement):
+        (WebCore::Element::clearBeforePseudoElement):
+        (WebCore::Element::clearAfterPseudoElement):
+
+            Reset after clear too.
+
+        * dom/Element.h:
+        * dom/Element.h:
+        * dom/Node.cpp:
+        * dom/Node.h:
+        (WebCore::Node::isInsertionPoint):
+        (WebCore::Node::setNeedsNodeRenderingTraversalSlowPath):
+        
+            Make protected.
+
+        * dom/NodeRenderingTraversal.h:
+        (WebCore::NodeRenderingTraversal::parent):
+        (WebCore::NodeRenderingTraversal::nextSibling):
+        (WebCore::NodeRenderingTraversal::previousSibling):
+
 2013-09-08  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.h

@@ -221 +221 @@
 }
 
-inline bool Node::needsShadowTreeWalker() const
-{
-    if (getFlag(NeedsShadowTreeWalkerFlag))
+inline bool Node::needsNodeRenderingTraversalSlowPath() const
+{
+    if (getFlag(NeedsNodeRenderingTraversalSlowPathFlag))
         return true;
     ContainerNode* parent = parentOrShadowHostNode();
-    return parent && parent->getFlag(NeedsShadowTreeWalkerFlag);
+    return parent && parent->getFlag(NeedsNodeRenderingTraversalSlowPathFlag);
 }
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1409 +1409 @@
 }
 
+static bool shouldUseNodeRenderingTraversalSlowPath(const Element& element)
+{
+    if (element.isShadowRoot())
+        return true;
+    if (element.isPseudoElement() || element.beforePseudoElement() || element.afterPseudoElement())
+        return true;
+    return element.isInsertionPoint() || element.shadowRoot();
+}
+
+void Element::resetNeedsNodeRenderingTraversalSlowPath()
+{
+    setNeedsNodeRenderingTraversalSlowPath(shouldUseNodeRenderingTraversalSlowPath(*this));
+}
+
 void Element::addShadowRoot(PassRefPtr<ShadowRoot> newShadowRoot)
 {
@@ -1422 +1436 @@
     ChildNodeInsertionNotifier(this).notify(shadowRoot);
 
-    // Existence of shadow roots requires the host and its children to do traversal using ComposedShadowTreeWalker.
-    setNeedsShadowTreeWalker();
+    resetNeedsNodeRenderingTraversalSlowPath();
 
     // FIXME(94905): ShadowHost should be reattached during recalcStyle.
@@ -2350 +2363 @@
 {
     ensureElementRareData().setBeforePseudoElement(element);
-    resetNeedsShadowTreeWalker();
+    resetNeedsNodeRenderingTraversalSlowPath();
 }
 
@@ -2356 +2369 @@
 {
     ensureElementRareData().setAfterPseudoElement(element);
-    resetNeedsShadowTreeWalker();
+    resetNeedsNodeRenderingTraversalSlowPath();
 }
 
@@ -2375 +2388 @@
     disconnectPseudoElement(elementRareData()->beforePseudoElement());
     elementRareData()->setBeforePseudoElement(nullptr);
+    resetNeedsNodeRenderingTraversalSlowPath();
 }
 
@@ -2383 +2397 @@
     disconnectPseudoElement(elementRareData()->afterPseudoElement());
     elementRareData()->setAfterPseudoElement(nullptr);
+    resetNeedsNodeRenderingTraversalSlowPath();
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -591 +591 @@
     void clearBeforePseudoElement();
     void clearAfterPseudoElement();
+    void resetNeedsNodeRenderingTraversalSlowPath();
 
     virtual bool areAuthorShadowsAllowed() const { return true; }

trunk/Source/WebCore/dom/Node.cpp

@@ -1046 +1046 @@
 }
 
-bool Node::needsShadowTreeWalkerSlow() const
-{
-    if (isShadowRoot())
-        return true;
-    if (!isElementNode())
-        return false;
-    const Element* asElement = toElement(this);
-    if (asElement->isPseudoElement() || asElement->beforePseudoElement() || asElement->afterPseudoElement())
-        return true;
-    return asElement->isInsertionPoint() || asElement->shadowRoot();
-}
-
 bool Node::isRootEditableElement() const
 {

trunk/Source/WebCore/dom/Node.h

@@ -256 +256 @@
     bool isDocumentFragment() const { return getFlag(IsDocumentFragmentFlag); }
     bool isShadowRoot() const { return isDocumentFragment() && isTreeScope(); }
-    bool isInsertionPoint() const { return getFlag(NeedsShadowTreeWalkerFlag) && isInsertionPointNode(); }
+    bool isInsertionPoint() const { return getFlag(NeedsNodeRenderingTraversalSlowPathFlag) && isInsertionPointNode(); }
     // Returns Node rather than InsertionPoint. Should be used only for language bindings.
     Node* insertionParentForBinding() const;
 
-    bool needsShadowTreeWalker() const;
-    bool needsShadowTreeWalkerSlow() const;
-    void setNeedsShadowTreeWalker() { setFlag(NeedsShadowTreeWalkerFlag); }
-    void resetNeedsShadowTreeWalker() { setFlag(needsShadowTreeWalkerSlow(), NeedsShadowTreeWalkerFlag); }
+    bool needsNodeRenderingTraversalSlowPath() const;
 
     bool inNamedFlow() const { return getFlag(InNamedFlowFlag); }
@@ -634 +631 @@
         HasScopedHTMLStyleChildFlag = 1 << 22,
         HasEventTargetDataFlag = 1 << 23,
-        NeedsShadowTreeWalkerFlag = 1 << 25,
+        NeedsNodeRenderingTraversalSlowPathFlag = 1 << 25,
         IsInShadowTreeFlag = 1 << 26,
 
@@ -653 +650 @@
         CreateContainer = DefaultNodeFlags | IsContainerFlag, 
         CreateElement = CreateContainer | IsElementFlag, 
-        CreatePseudoElement =  CreateElement | InDocumentFlag | NeedsShadowTreeWalkerFlag,
-        CreateShadowRoot = CreateContainer | IsDocumentFragmentFlag | NeedsShadowTreeWalkerFlag | IsInShadowTreeFlag,
+        CreatePseudoElement =  CreateElement | InDocumentFlag | NeedsNodeRenderingTraversalSlowPathFlag,
+        CreateShadowRoot = CreateContainer | IsDocumentFragmentFlag | NeedsNodeRenderingTraversalSlowPathFlag | IsInShadowTreeFlag,
         CreateDocumentFragment = CreateContainer | IsDocumentFragmentFlag,
         CreateStyledElement = CreateElement | IsStyledElementFlag, 
@@ -660 +657 @@
         CreateSVGElement = CreateStyledElement | IsSVGFlag | HasCustomStyleResolveCallbacksFlag,
         CreateDocument = CreateContainer | InDocumentFlag,
-        CreateInsertionPoint = CreateHTMLElement | NeedsShadowTreeWalkerFlag,
+        CreateInsertionPoint = CreateHTMLElement | NeedsNodeRenderingTraversalSlowPathFlag,
         CreateEditingText = CreateText | IsEditingTextFlag,
     };
@@ -678 +675 @@
 
     void setHasCustomStyleResolveCallbacks() { setFlag(true, HasCustomStyleResolveCallbacksFlag); }
+
+    void setNeedsNodeRenderingTraversalSlowPath(bool flag) { setFlag(flag, NeedsNodeRenderingTraversalSlowPathFlag); }
 
     Document* documentInternal() const { return treeScope()->documentScope(); }

trunk/Source/WebCore/dom/NodeRenderingTraversal.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28 +29 @@
 #define NodeRenderingTraversal_h
 
-#include "Element.h"
+#include "ContainerNode.h"
 
 namespace WebCore {
-
-class InsertionPoint;
 
 namespace NodeRenderingTraversal {
 
 ContainerNode* parent(const Node*);
-ContainerNode* parentSlow(const Node*);
 Node* nextSibling(const Node*);
-Node* nextSiblingSlow(const Node*);
 Node* previousSibling(const Node*);
-Node* previousSiblingSlow(const Node*);
 
 Node* nextInScope(const Node*);
@@ -48 +44 @@
 Node* lastChildInScope(const Node*);
 
+ContainerNode* parentSlow(const Node*);
+Node* nextSiblingSlow(const Node*);
+Node* previousSiblingSlow(const Node*);
+
 inline ContainerNode* parent(const Node* node)
 {
-    if (!node->needsShadowTreeWalker()) {
-#ifndef NDEBUG
-        ASSERT(node->parentNode() == parentSlow(node));
-#endif
-        return node->parentNodeGuaranteedHostFree();
-    }
+    if (node->needsNodeRenderingTraversalSlowPath())
+        return parentSlow(node);
 
-    return parentSlow(node);
+    ASSERT(node->parentNode() == parentSlow(node));
+    return node->parentNodeGuaranteedHostFree();
 }
 
 inline Node* nextSibling(const Node* node)
 {
-    if (!node->needsShadowTreeWalker()) {
-        ASSERT(nextSiblingSlow(node) == node->nextSibling());
-        return node->nextSibling();
-    }
+    if (node->needsNodeRenderingTraversalSlowPath())
+        return nextSiblingSlow(node);
 
-    return nextSiblingSlow(node);
+    ASSERT(nextSiblingSlow(node) == node->nextSibling());
+    return node->nextSibling();
 }
 
 inline Node* previousSibling(const Node* node)
 {
-    if (!node->needsShadowTreeWalker()) {
-        ASSERT(previousSiblingSlow(node) == node->previousSibling());
-        return node->previousSibling();
-    }
+    if (node->needsNodeRenderingTraversalSlowPath())
+        return previousSiblingSlow(node);
 
-    return previousSiblingSlow(node);
+    ASSERT(previousSiblingSlow(node) == node->previousSibling());
+    return node->previousSibling();
 }