Changeset 198992 in webkit

Timestamp:

Apr 3, 2016, 3:00:20 PM (9 years ago)

Author:

Antti Koivisto

Message:

Tighten ComposedTreeAncestorIterator to return Elements
​https://bugs.webkit.org/show_bug.cgi?id=150324

Reviewed by Andreas Kling.

Only other thing it could credibly return was Document. We can exclude it from the composed tree and avoid some casting.

• dom/ComposedTreeAncestorIterator.h:

(WebCore::ComposedTreeAncestorIterator::operator*):
(WebCore::ComposedTreeAncestorIterator::operator->):
(WebCore::ComposedTreeAncestorIterator::operator==):
(WebCore::ComposedTreeAncestorIterator::operator!=):
(WebCore::ComposedTreeAncestorIterator::operator++):
(WebCore::ComposedTreeAncestorIterator::get):
(WebCore::ComposedTreeAncestorIterator::ComposedTreeAncestorIterator):
(WebCore::ComposedTreeAncestorIterator::traverseParent):
(WebCore::ComposedTreeAncestorAdapter::begin):
(WebCore::ComposedTreeAncestorAdapter::end):
(WebCore::ComposedTreeAncestorAdapter::first):

• dom/Element.cpp:

(WebCore::Element::resolveComputedStyle):

• dom/Node.cpp:

(WebCore::Node::updateAncestorsForStyleRecalc):
(WebCore::Node::setNeedsStyleRecalc):

• rendering/RenderNamedFlowThread.cpp:

(WebCore::RenderNamedFlowThread::isChildAllowed):
(WebCore::RenderNamedFlowThread::dispatchRegionOversetChangeEventIfNeeded):

• style/RenderTreeUpdater.cpp:

(WebCore::findRenderingRoot):
(WebCore::RenderTreeUpdater::commit):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ComposedTreeAncestorIterator.h (modified) (6 diffs)
• dom/Element.cpp (modified) (1 diff)
• dom/Node.cpp (modified) (2 diffs)
• rendering/RenderNamedFlowThread.cpp (modified) (1 diff)
• style/RenderTreeUpdater.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-03  Antti Koivisto  <antti@apple.com>
+
+        Tighten ComposedTreeAncestorIterator to return Elements
+        https://bugs.webkit.org/show_bug.cgi?id=150324
+
+        Reviewed by Andreas Kling.
+
+        Only other thing it could credibly return was Document. We can exclude it from the composed tree and avoid some casting.
+
+        * dom/ComposedTreeAncestorIterator.h:
+        (WebCore::ComposedTreeAncestorIterator::operator*):
+        (WebCore::ComposedTreeAncestorIterator::operator->):
+        (WebCore::ComposedTreeAncestorIterator::operator==):
+        (WebCore::ComposedTreeAncestorIterator::operator!=):
+        (WebCore::ComposedTreeAncestorIterator::operator++):
+        (WebCore::ComposedTreeAncestorIterator::get):
+        (WebCore::ComposedTreeAncestorIterator::ComposedTreeAncestorIterator):
+        (WebCore::ComposedTreeAncestorIterator::traverseParent):
+        (WebCore::ComposedTreeAncestorAdapter::begin):
+        (WebCore::ComposedTreeAncestorAdapter::end):
+        (WebCore::ComposedTreeAncestorAdapter::first):
+        * dom/Element.cpp:
+        (WebCore::Element::resolveComputedStyle):
+        * dom/Node.cpp:
+        (WebCore::Node::updateAncestorsForStyleRecalc):
+        (WebCore::Node::setNeedsStyleRecalc):
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::isChildAllowed):
+        (WebCore::RenderNamedFlowThread::dispatchRegionOversetChangeEventIfNeeded):
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::findRenderingRoot):
+        (WebCore::RenderTreeUpdater::commit):
+
 2016-04-03  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/ComposedTreeAncestorIterator.h

@@ -37 +37 @@
 class ComposedTreeAncestorIterator {
 public:
-    ComposedTreeAncestorIterator(ContainerNode& root);
-    ComposedTreeAncestorIterator(ContainerNode& root, Node& current);
+    ComposedTreeAncestorIterator();
+    ComposedTreeAncestorIterator(Node& current);
 
-    ContainerNode& operator*() { return get(); }
-    ContainerNode* operator->() { return &get(); }
+    Element& operator*() { return get(); }
+    Element* operator->() { return &get(); }
 
     bool operator==(const ComposedTreeAncestorIterator& other) const { return m_current == other.m_current; }
@@ -48 +48 @@
     ComposedTreeAncestorIterator& operator++() { return traverseParent(); }
 
-    ContainerNode& get() { return downcast<ContainerNode>(*m_current); }
+    Element& get() { return downcast<Element>(*m_current); }
     ComposedTreeAncestorIterator& traverseParent();
 
@@ -54 +54 @@
     void traverseParentInShadowTree();
 
-    ContainerNode& m_root;
     Node* m_current { 0 };
 };
 
-inline ComposedTreeAncestorIterator::ComposedTreeAncestorIterator(ContainerNode& root)
-    : m_root(root)
+inline ComposedTreeAncestorIterator::ComposedTreeAncestorIterator()
 {
-    ASSERT(!is<ShadowRoot>(m_root));
 }
 
-inline ComposedTreeAncestorIterator::ComposedTreeAncestorIterator(ContainerNode& root, Node& current)
-    : m_root(root)
-    , m_current(&current)
+inline ComposedTreeAncestorIterator::ComposedTreeAncestorIterator(Node& current)
+    : m_current(&current)
 {
-    ASSERT(!is<ShadowRoot>(m_root));
     ASSERT(!is<ShadowRoot>(m_current));
 }
@@ -74 +69 @@
 inline ComposedTreeAncestorIterator& ComposedTreeAncestorIterator::traverseParent()
 {
-    if (m_current == &m_root) {
-        m_current = nullptr;
-        return *this;
-    }
-
     auto* parent = m_current->parentNode();
     if (!parent) {
@@ -88 +78 @@
         return *this;
     }
+    if (!is<Element>(*parent)) {
+        m_current = nullptr;
+        return *this;
+    };
 
     if (auto* shadowRoot = parent->shadowRoot()) {
@@ -114 +108 @@
     {
         if (is<ShadowRoot>(m_node))
-            return iterator(m_node.document(), *downcast<ShadowRoot>(m_node).host());
+            return iterator(*downcast<ShadowRoot>(m_node).host());
         if (is<PseudoElement>(m_node))
-            return iterator(m_node.document(), *downcast<PseudoElement>(m_node).hostElement());
-        return iterator(m_node.document(), m_node).traverseParent();
+            return iterator(*downcast<PseudoElement>(m_node).hostElement());
+        return iterator(m_node).traverseParent();
     }
     iterator end()
     {
-        return iterator(m_node.document());
+        return iterator();
     }
-    ContainerNode* first()
+    Element* first()
     {
         auto it = begin();

trunk/Source/WebCore/dom/Element.cpp

@@ -2484 +2484 @@
     auto composedAncestors = composedTreeAncestors(*this);
     for (auto& ancestor : composedAncestors) {
-        if (!is<Element>(ancestor))
-            break;
-        auto& ancestorElement = downcast<Element>(ancestor);
-        elementsRequiringComputedStyle.prepend(&ancestorElement);
-        if (auto* existingStyle = ancestorElement.existingComputedStyle()) {
+        elementsRequiringComputedStyle.prepend(&ancestor);
+        if (auto* existingStyle = ancestor.existingComputedStyle()) {
             computedStyle = existingStyle;
             break;

trunk/Source/WebCore/dom/Node.cpp

@@ -747 +747 @@
         it->setDirectChildNeedsStyleRecalc();
 
-        if (is<Element>(*it) && downcast<Element>(*it).childrenAffectedByPropertyBasedBackwardPositionalRules()) {
+        if (it->childrenAffectedByPropertyBasedBackwardPositionalRules()) {
             if (it->styleChangeType() < FullStyleChange)
                 it->setStyleChange(FullStyleChange);
@@ -762 +762 @@
     }
 
-    Document& document = this->document();
-    if (document.childNeedsStyleRecalc())
-        document.scheduleStyleRecalc();
+    auto* documentElement = document().documentElement();
+    if (!documentElement)
+        return;
+    if (!documentElement->childNeedsStyleRecalc() && !documentElement->needsStyleRecalc())
+        return;
+    document().setChildNeedsStyleRecalc();
+    document().scheduleStyleRecalc();
 }
 

trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp

@@ -549 +549 @@
 
     auto* originalParent = composedTreeAncestors(*child.node()).first();
-    if (!is<Element>(originalParent) || !originalParent->renderer())
+    if (!originalParent || !originalParent->renderer())
         return true;
 
-    return downcast<Element>(*originalParent).renderer()->isChildAllowed(child, style);
+    return originalParent->renderer()->isChildAllowed(child, style);
 }
 

trunk/Source/WebCore/style/RenderTreeUpdater.cpp

@@ -64 +64 @@
 static ContainerNode& findRenderingRoot(ContainerNode& node)
 {
-    auto& document = node.document();
-    for (ComposedTreeAncestorIterator it(document, node), end(document); it != end; ++it) {
-        if (it->renderer())
-            return *it;
-        ASSERT(hasImplicitDisplayContents(downcast<Element>(*it)));
+    if (node.renderer())
+        return node;
+    for (auto& ancestor : composedTreeAncestors(node)) {
+        if (ancestor.renderer())
+            return ancestor;
+        ASSERT(hasImplicitDisplayContents(ancestor));
     }
     ASSERT_NOT_REACHED();
-    return document;
+    return node.document();
 }