Changeset 154327 in webkit

Timestamp:

Aug 20, 2013 8:27:41 AM (11 years ago)

Author:

Antti Koivisto

Message:

<​https://webkit.org/b/120017> Remove NodeRenderingTraversal::ParentDetails

Reviewed by Andreas Kling.

Remove this oddly factored type that is used to optionally collect some data during ComposedShadowTreeWalker parent traversal.

Also removed support for reset-style-inheritance attribute in InsertionPoint. We don't use or expose it.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::State::initForStyleResolve):
(WebCore::StyleResolver::styleForElement):

• css/StyleResolver.h:

(WebCore::StyleResolver::State::State):
(WebCore::StyleResolver::State::elementLinkState):

Remove m_distributedToInsertionPoint State field. We never hit the cases where it was used.

• dom/ComposedShadowTreeWalker.cpp:

(WebCore::ComposedShadowTreeWalker::traverseSiblingOrBackToInsertionPoint):
(WebCore::ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents):
(WebCore::ComposedShadowTreeWalker::traverseParent):

Return null instead of setting childWasOutOfComposition to details object. That's what would happen anyway in the caller.

(WebCore::ComposedShadowTreeWalker::traverseParentInCurrentTree):
(WebCore::ComposedShadowTreeWalker::traverseParentBackToShadowRootOrHost):

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

(WebCore::Node::insertionParentForBinding):

• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::NodeRenderingContext):
(WebCore::NodeRenderingContext::isOnEncapsulationBoundary):

Make this look up InsertionPoint directly intead of relying it being populated in m_parentDetails. The function is used only in
a few non-performance critical places.

(WebCore::NodeRenderingContext::resetStyleInheritance):

Return parent ShadowRoots resetStyleInheritance() flag instead of using m_parentDetails.

• dom/NodeRenderingContext.h:
• dom/NodeRenderingTraversal.cpp:

(WebCore::NodeRenderingTraversal::parentSlow):

• dom/NodeRenderingTraversal.h:

(WebCore::NodeRenderingTraversal::parent):

Remove ParentDetails.

• html/HTMLAttributeNames.in:
• html/shadow/InsertionPoint.cpp:

Remove unused resetStyleInheritance attribute.

(WebCore::InsertionPoint::removedFrom):
(WebCore::findInsertionPointOf):

Renamed for clarity.

• html/shadow/InsertionPoint.h:
• testing/Internals.cpp:

(WebCore::Internals::includerFor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (3 diffs)
• css/StyleResolver.h (modified) (3 diffs)
• dom/ComposedShadowTreeWalker.cpp (modified) (5 diffs)
• dom/ComposedShadowTreeWalker.h (modified) (3 diffs)
• dom/Node.cpp (modified) (1 diff)
• dom/NodeRenderingContext.cpp (modified) (4 diffs)
• dom/NodeRenderingContext.h (modified) (4 diffs)
• dom/NodeRenderingTraversal.cpp (modified) (1 diff)
• dom/NodeRenderingTraversal.h (modified) (2 diffs)
• html/HTMLAttributeNames.in (modified) (1 diff)
• html/shadow/InsertionPoint.cpp (modified) (2 diffs)
• html/shadow/InsertionPoint.h (modified) (3 diffs)
• testing/Internals.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-20  Antti Koivisto  <antti@apple.com>
+
+        <https://webkit.org/b/120017> Remove NodeRenderingTraversal::ParentDetails
+
+        Reviewed by Andreas Kling.
+
+        Remove this oddly factored type that is used to optionally collect some data during ComposedShadowTreeWalker parent traversal.
+        
+        Also removed support for reset-style-inheritance attribute in InsertionPoint. We don't use or expose it.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::State::initForStyleResolve):
+        (WebCore::StyleResolver::styleForElement):
+        * css/StyleResolver.h:
+        (WebCore::StyleResolver::State::State):
+        (WebCore::StyleResolver::State::elementLinkState):
+        
+            Remove m_distributedToInsertionPoint State field. We never hit the cases where it was used.
+
+        * dom/ComposedShadowTreeWalker.cpp:
+        (WebCore::ComposedShadowTreeWalker::traverseSiblingOrBackToInsertionPoint):
+        (WebCore::ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents):
+        (WebCore::ComposedShadowTreeWalker::traverseParent):
+        
+            Return null instead of setting childWasOutOfComposition to details object. That's what would happen anyway in the caller.
+
+        (WebCore::ComposedShadowTreeWalker::traverseParentInCurrentTree):
+        (WebCore::ComposedShadowTreeWalker::traverseParentBackToShadowRootOrHost):
+        * dom/ComposedShadowTreeWalker.h:
+        * dom/Node.cpp:
+        (WebCore::Node::insertionParentForBinding):
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::NodeRenderingContext):
+        (WebCore::NodeRenderingContext::isOnEncapsulationBoundary):
+        
+            Make this look up InsertionPoint directly intead of relying it being populated in m_parentDetails. The function is used only in
+            a few non-performance critical places.
+
+        (WebCore::NodeRenderingContext::resetStyleInheritance):
+        
+            Return parent ShadowRoots resetStyleInheritance() flag instead of using m_parentDetails.
+
+        * dom/NodeRenderingContext.h:
+        * dom/NodeRenderingTraversal.cpp:
+        (WebCore::NodeRenderingTraversal::parentSlow):
+        * dom/NodeRenderingTraversal.h:
+        (WebCore::NodeRenderingTraversal::parent):
+        
+            Remove ParentDetails.
+
+        * html/HTMLAttributeNames.in:
+        * html/shadow/InsertionPoint.cpp:
+        
+            Remove unused resetStyleInheritance attribute.
+
+        (WebCore::InsertionPoint::removedFrom):
+        (WebCore::findInsertionPointOf):
+        
+            Renamed for clarity.
+
+        * html/shadow/InsertionPoint.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::includerFor):
+
 2013-08-20  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -434 +434 @@
             parentStyle ? parentStyle :
             m_parentNode ? m_parentNode->renderStyle() : 0;
-        m_distributedToInsertionPoint = context.insertionPoint();
     } else {
         m_parentNode = 0;
         m_parentStyle = parentStyle;
-        m_distributedToInsertionPoint = false;
     }
 
@@ -810 +808 @@
     initElement(element);
     state.initForStyleResolve(document(), element, defaultParent, regionForStyling);
-    if (sharingBehavior == AllowStyleSharing && !state.distributedToInsertionPoint()) {
+    if (sharingBehavior == AllowStyleSharing) {
         RenderStyle* sharedStyle = locateSharedStyle();
         if (sharedStyle) {
@@ -824 +822 @@
         state.setStyle(defaultStyleForElement());
         state.setParentStyle(RenderStyle::clone(state.style()));
-    }
-    // contenteditable attribute (implemented by -webkit-user-modify) should
-    // be propagated from shadow host to distributed node.
-    if (state.distributedToInsertionPoint()) {
-        if (Element* parent = element->parentElement()) {
-            if (RenderStyle* styleOfShadowHost = parent->renderStyle())
-                state.style()->setUserModify(styleOfShadowHost->userModify());
-        }
     }
 

trunk/Source/WebCore/css/StyleResolver.h

@@ -416 +416 @@
         , m_regionForStyling(0)
         , m_elementLinkState(NotInsideLink)
-        , m_distributedToInsertionPoint(false)
         , m_elementAffectedByClassRules(false)
         , m_applyPropertyToRegularStyle(true)
@@ -447 +446 @@
         const RenderRegion* regionForStyling() const { return m_regionForStyling; }
         EInsideLink elementLinkState() const { return m_elementLinkState; }
-        bool distributedToInsertionPoint() const { return m_distributedToInsertionPoint; }
         void setElementAffectedByClassRules(bool isAffected) { m_elementAffectedByClassRules = isAffected; }
         bool elementAffectedByClassRules() const { return m_elementAffectedByClassRules; }
@@ -500 +498 @@
         
         EInsideLink m_elementLinkState;
-
-        bool m_distributedToInsertionPoint;
 
         bool m_elementAffectedByClassRules;

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.cpp

@@ -154 +154 @@
         return traverseSiblingInCurrentTree(node, direction);
 
-    InsertionPoint* insertionPoint = resolveReprojection(node);
+    InsertionPoint* insertionPoint = findInsertionPointOf(node);
     if (!insertionPoint)
         return traverseSiblingInCurrentTree(node, direction);
@@ -179 +179 @@
 }
 
-inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node, ParentTraversalDetails* details) const
+inline Node* ComposedShadowTreeWalker::traverseNodeEscapingFallbackContents(const Node* node) const
 {
     ASSERT(node);
@@ -186 +186 @@
     const InsertionPoint* insertionPoint = toInsertionPoint(node);
     return insertionPoint->hasDistribution() ? 0 :
-        insertionPoint->isActive() ? traverseParent(node, details) : const_cast<Node*>(node);
+        insertionPoint->isActive() ? traverseParent(node) : const_cast<Node*>(node);
 }
 
@@ -198 +198 @@
 // FIXME: Use an iterative algorithm so that it can be inlined.
 // https://bugs.webkit.org/show_bug.cgi?id=90415
-Node* ComposedShadowTreeWalker::traverseParent(const Node* node, ParentTraversalDetails* details) const
+Node* ComposedShadowTreeWalker::traverseParent(const Node* node) const
 {
     if (node->isPseudoElement())
@@ -207 +207 @@
 
     if (nodeCanBeDistributed(node)) {
-        if (InsertionPoint* insertionPoint = resolveReprojection(node)) {
-            if (details)
-                details->didTraverseInsertionPoint(insertionPoint);
-            return traverseParent(insertionPoint, details);
-        }
-
-        // The node is a non-distributed light child or older shadow's child.
-        if (details)
-            details->childWasOutOfComposition();
-    }
-    return traverseParentInCurrentTree(node, details);
-}
-
-inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node, ParentTraversalDetails* details) const
+        if (InsertionPoint* insertionPoint = findInsertionPointOf(node))
+            return traverseParent(insertionPoint);
+        return 0;
+    }
+    return traverseParentInCurrentTree(node);
+}
+
+inline Node* ComposedShadowTreeWalker::traverseParentInCurrentTree(const Node* node) const
 {
     if (Node* parent = node->parentNode())
-        return parent->isShadowRoot() ? traverseParentBackToShadowRootOrHost(toShadowRoot(parent), details) : traverseNodeEscapingFallbackContents(parent, details);
-    return 0;
-}
-
-Node* ComposedShadowTreeWalker::traverseParentBackToShadowRootOrHost(const ShadowRoot* shadowRoot, ParentTraversalDetails* details) const
+        return parent->isShadowRoot() ? traverseParentBackToShadowRootOrHost(toShadowRoot(parent)) : traverseNodeEscapingFallbackContents(parent);
+    return 0;
+}
+
+Node* ComposedShadowTreeWalker::traverseParentBackToShadowRootOrHost(const ShadowRoot* shadowRoot) const
 {
     ASSERT(shadowRoot);
 
-    if (canCrossUpperBoundary()) {
-        if (details)
-            details->didTraverseShadowRoot(shadowRoot);
+    if (canCrossUpperBoundary())
         return shadowRoot->hostElement();
-    }
 
     return const_cast<ShadowRoot*>(shadowRoot);

trunk/Source/WebCore/dom/ComposedShadowTreeWalker.h

@@ -41 +41 @@
 class ComposedShadowTreeWalker {
 public:
-    typedef NodeRenderingTraversal::ParentDetails ParentTraversalDetails;
-
     enum Policy {
         CrossUpperBoundary,
@@ -72 +70 @@
     void previous();
 
-    Node* traverseParent(const Node*, ParentTraversalDetails* = 0) const;
+    Node* traverseParent(const Node*) const;
 
 private:
-    ComposedShadowTreeWalker(const Node*, ParentTraversalDetails*);
-
     enum TraversalDirection {
         TraversalDirectionForward,
@@ -120 +116 @@
     static Node* escapeFallbackContentElement(const Node*, TraversalDirection);
 
-    Node* traverseNodeEscapingFallbackContents(const Node*, ParentTraversalDetails* = 0) const;
-    Node* traverseParentInCurrentTree(const Node*, ParentTraversalDetails* = 0) const;
-    Node* traverseParentBackToShadowRootOrHost(const ShadowRoot*, ParentTraversalDetails* = 0) const;
+    Node* traverseNodeEscapingFallbackContents(const Node*) const;
+    Node* traverseParentInCurrentTree(const Node*) const;
+    Node* traverseParentBackToShadowRootOrHost(const ShadowRoot*) const;
 
     const Node* m_node;

trunk/Source/WebCore/dom/Node.cpp

@@ -1040 +1040 @@
 Node* Node::insertionParentForBinding() const
 {
-    return resolveReprojection(this);
+    return findInsertionPointOf(this);
 }
 

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -57 +57 @@
     , m_parentFlowRenderer(0)
 {
-    m_renderingParent = NodeRenderingTraversal::parent(node, &m_parentDetails);
+    m_renderingParent = NodeRenderingTraversal::parent(node);
 }
 
@@ -73 +73 @@
     , m_parentFlowRenderer(0)
 {
-    m_renderingParent = NodeRenderingTraversal::parent(node, &m_parentDetails);
+    m_renderingParent = NodeRenderingTraversal::parent(node);
 }
 
@@ -238 +238 @@
 bool NodeRenderingContext::isOnEncapsulationBoundary() const
 {
-    return isOnUpperEncapsulationBoundary() || isLowerEncapsulationBoundary(m_parentDetails.insertionPoint()) || isLowerEncapsulationBoundary(m_node->parentNode());
+    return isOnUpperEncapsulationBoundary()
+        || isLowerEncapsulationBoundary(findInsertionPointOf(m_node))
+        || isLowerEncapsulationBoundary(m_node->parentNode());
 }
 
@@ -335 +337 @@
 }
 
-}
+bool NodeRenderingContext::resetStyleInheritance() const
+{
+    ContainerNode* parent = m_node->parentNode();
+    return parent && parent->isShadowRoot() && toShadowRoot(parent)->resetStyleInheritance();
+}
+
+}

trunk/Source/WebCore/dom/NodeRenderingContext.h

@@ -60 +60 @@
     RenderObject* nextRenderer() const;
     RenderObject* previousRenderer() const;
-    InsertionPoint* insertionPoint() const;
 
     const RenderStyle* style() const;
@@ -74 +73 @@
     Node* m_node;
     ContainerNode* m_renderingParent;
-    NodeRenderingTraversal::ParentDetails m_parentDetails;
     RefPtr<RenderStyle> m_style;
     RenderNamedFlowThread* m_parentFlowRenderer;
@@ -89 +87 @@
 }
 
-inline bool NodeRenderingContext::resetStyleInheritance() const
-{
-    return m_parentDetails.resetStyleInheritance();
-}
-
 inline const RenderStyle* NodeRenderingContext::style() const
 {
@@ -99 +92 @@
 }
 
-inline InsertionPoint* NodeRenderingContext::insertionPoint() const
-{
-    return m_parentDetails.insertionPoint();
-}
-
 } // namespace WebCore
 

trunk/Source/WebCore/dom/NodeRenderingTraversal.cpp

@@ -35 +35 @@
 namespace NodeRenderingTraversal {
 
-void ParentDetails::didTraverseInsertionPoint(InsertionPoint* insertionPoint)
-{
-    if (!m_insertionPoint) {
-        m_insertionPoint = insertionPoint;
-        m_resetStyleInheritance  = m_resetStyleInheritance || insertionPoint->resetStyleInheritance();
-    }
-}
-
-void ParentDetails::didTraverseShadowRoot(const ShadowRoot* root)
-{
-    m_resetStyleInheritance  = m_resetStyleInheritance || root->resetStyleInheritance();
-}
-
-ContainerNode* parentSlow(const Node* node, ParentDetails* details)
+ContainerNode* parentSlow(const Node* node)
 {
     ComposedShadowTreeWalker walker(node, ComposedShadowTreeWalker::CrossUpperBoundary, ComposedShadowTreeWalker::CanStartFromShadowBoundary);
-    ContainerNode* found = toContainerNode(walker.traverseParent(walker.get(), details));
-    return details->outOfComposition() ? 0 : found;
+    return toContainerNode(walker.traverseParent(walker.get()));
 }
 

trunk/Source/WebCore/dom/NodeRenderingTraversal.h

@@ -36 +36 @@
 namespace NodeRenderingTraversal {
 
-class ParentDetails {
-public:
-    ParentDetails()
-        : m_insertionPoint(0)
-        , m_resetStyleInheritance(false)
-        , m_outOfComposition(false)
-    { }
-
-    InsertionPoint* insertionPoint() const { return m_insertionPoint; }
-    bool resetStyleInheritance() const { return m_resetStyleInheritance; }
-    bool outOfComposition() const { return m_outOfComposition; }
-
-    void didTraverseInsertionPoint(InsertionPoint*);
-    void didTraverseShadowRoot(const ShadowRoot*);
-    void childWasOutOfComposition() { m_outOfComposition = true; }
-
-    bool operator==(const ParentDetails& other)
-    {
-        return m_insertionPoint == other.m_insertionPoint
-            && m_resetStyleInheritance == other.m_resetStyleInheritance
-            && m_outOfComposition == other.m_outOfComposition;
-    }
-
-private:
-    InsertionPoint* m_insertionPoint;
-    bool m_resetStyleInheritance;
-    bool m_outOfComposition;
-};
-
-ContainerNode* parent(const Node*, ParentDetails*);
-ContainerNode* parentSlow(const Node*, ParentDetails*);
+ContainerNode* parent(const Node*);
+ContainerNode* parentSlow(const Node*);
 Node* nextSibling(const Node*);
 Node* nextSiblingSlow(const Node*);
@@ -77 +48 @@
 Node* lastChildInScope(const Node*);
 
-inline ContainerNode* parent(const Node* node, ParentDetails* details)
+inline ContainerNode* parent(const Node* node)
 {
     if (!node->needsShadowTreeWalker()) {
 #ifndef NDEBUG
-        ParentDetails slowDetails;
-        ASSERT(node->parentNode() == parentSlow(node, &slowDetails));
-        ASSERT(slowDetails == *details);
+        ASSERT(node->parentNode() == parentSlow(node));
 #endif
         return node->parentNodeGuaranteedHostFree();
     }
 
-    return parentSlow(node, details);
+    return parentSlow(node);
 }
 

trunk/Source/WebCore/html/HTMLAttributeNames.in

@@ -284 +284 @@
 rel
 required
-reset-style-inheritance
 results
 rev

trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

@@ -148 +148 @@
     HTMLElement::removedFrom(insertionPoint);
 }
-
-void InsertionPoint::parseAttribute(const QualifiedName& name, const AtomicString& value)
-{
-    if (name == reset_style_inheritanceAttr) {
-        if (!inDocument() || !attached() || !isActive())
-            return;
-        containingShadowRoot()->hostElement()->setNeedsStyleRecalc();
-    } else
-        HTMLElement::parseAttribute(name, value);
-}
-
-bool InsertionPoint::resetStyleInheritance() const
-{
-    return fastHasAttribute(reset_style_inheritanceAttr);
-}
-
-void InsertionPoint::setResetStyleInheritance(bool value)
-{
-    setBooleanAttribute(reset_style_inheritanceAttr, value);
-}
     
 Node* InsertionPoint::firstDistributed() const
@@ -209 +189 @@
 }
 
-InsertionPoint* resolveReprojection(const Node* projectedNode)
+InsertionPoint* findInsertionPointOf(const Node* projectedNode)
 {
     if (ShadowRoot* shadowRoot = shadowRootOfParentForDistribution(projectedNode)) {

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -63 +63 @@
     virtual Type insertionPointType() const { return InternalType; }
 
-    bool resetStyleInheritance() const;
-    void setResetStyleInheritance(bool);
-
     virtual void willAttachRenderers() OVERRIDE;
     virtual void willDetachRenderers() OVERRIDE;
@@ -82 +79 @@
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
     virtual void removedFrom(ContainerNode*) OVERRIDE;
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
     virtual bool isInsertionPointNode() const OVERRIDE { return true; }
 
@@ -146 +142 @@
 }
 
-InsertionPoint* resolveReprojection(const Node*);
+InsertionPoint* findInsertionPointOf(const Node*);
 
 } // namespace WebCore

trunk/Source/WebCore/testing/Internals.cpp

@@ -669 +669 @@
 }
 
-Element* Internals::includerFor(Node* node, ExceptionCode& ec)
-{
-    if (!node) {
-        ec = INVALID_ACCESS_ERR;
-        return 0;
-    }
-
-    return NodeRenderingContext(node).insertionPoint();
+Element* Internals::includerFor(Node*, ExceptionCode& ec)
+{
+    ec = INVALID_ACCESS_ERR;
+    return 0;
 }