[Shadow DOM]: Empty shadow insertion points should behave like <shadow><content *leftover*></conten…

Source/core/dom/shadow/ElementShadow.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 22 matching lines @@
 #include "core/dom/shadow/ContentDistribution.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/shadow/HTMLContentElement.h"
 #include "core/html/shadow/HTMLShadowElement.h"
 
 namespace WebCore {
 
 class DistributionPool {
 public:
-    explicit DistributionPool(const ContainerNode*);
+    explicit DistributionPool(const ContainerNode&);
+    void clear();
     ~DistributionPool();
     void distributeTo(InsertionPoint*, ElementShadow*);
+    void populateChildren(const ContainerNode&);
 
 private:
-    void populateChildren(const ContainerNode*);
     void detachNonDistributedNodes();
     Vector<Node*, 32> m_nodes;
     Vector<bool, 32> m_distributed;
 };
 
-inline DistributionPool::DistributionPool(const ContainerNode* parent)
+inline DistributionPool::DistributionPool(const ContainerNode& parent)
 {
-    if (parent)
-        populateChildren(parent);
+    populateChildren(parent);
 }
 
-inline void DistributionPool::populateChildren(const ContainerNode* parent)
+inline void DistributionPool::clear()
 {
-    for (Node* child = parent->firstChild(); child; child = child->nextSibling()) {
+    detachNonDistributedNodes();
+    m_nodes.clear();
+    m_distributed.clear();
+}
+
+inline void DistributionPool::populateChildren(const ContainerNode& parent)
+{
+    clear();
+    for (Node* child = parent.firstChild(); child; child = child->nextSibling()) {
         if (isActiveInsertionPoint(*child)) {
             InsertionPoint* insertionPoint = toInsertionPoint(child);
             for (size_t i = 0; i < insertionPoint->size(); ++i)
                 m_nodes.append(insertionPoint->at(i));
         } else {
             m_nodes.append(child);
         }
     }
     m_distributed.resize(m_nodes.size());
     m_distributed.fill(false);
@@ skipping 175 matching lines @@
 
 const DestinationInsertionPoints* ElementShadow::destinationInsertionPointsFor(const Node* key) const
 {
     NodeToDestinationInsertionPoints::const_iterator it = m_nodeToInsertionPoints.find(key);
     return it == m_nodeToInsertionPoints.end() ? 0: &it->value;
 }
 
 void ElementShadow::distribute()
 {
     host()->setNeedsStyleRecalc();
+    Vector<HTMLShadowElement*, 32> shadowInsertionPoints;
+    DistributionPool pool(*host());
 
-    const ContainerNode* poolContainer = host();
-
-    Vector<HTMLShadowElement*, 32> shadowInsertionPoints;
     for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot()) {
-        DistributionPool pool(poolContainer);
-
         HTMLShadowElement* shadowInsertionPoint = 0;
         const Vector<RefPtr<InsertionPoint> >& insertionPoints = root->descendantInsertionPoints();
         for (size_t i = 0; i < insertionPoints.size(); ++i) {
             InsertionPoint* point = insertionPoints[i].get();
             if (!point->isActive())
                 continue;
             if (isHTMLShadowElement(point)) {
                 if (!shadowInsertionPoint)
                     shadowInsertionPoint = toHTMLShadowElement(point);
             } else {
                 pool.distributeTo(point, this);
                 if (ElementShadow* shadow = shadowWhereNodeCanBeDistributed(*point))
                     shadow->setNeedsDistributionRecalc();
             }
         }
-        if (shadowInsertionPoint)
+        if (shadowInsertionPoint) {
             shadowInsertionPoints.append(shadowInsertionPoint);
-        poolContainer = shadowInsertionPoint;
+            if (shadowInsertionPoint->hasChildNodes())
+                pool.populateChildren(*shadowInsertionPoint);
+        } else if (!root->isOldest()) {
+            pool.clear();
+        }
     }
 
     for (size_t i = shadowInsertionPoints.size(); i > 0; --i) {
         HTMLShadowElement* shadowInsertionPoint = shadowInsertionPoints[i - 1];
         ShadowRoot* root = shadowInsertionPoint->containingShadowRoot();
         ASSERT(root);
         if (root->olderShadowRoot() && root->olderShadowRoot()->type() == root->type()) {
             // Only allow reprojecting older shadow roots between the same type to
             // disallow reprojecting UA elements into author shadows.
             distributeNodeChildrenTo(shadowInsertionPoint, root->olderShadowRoot());
             root->olderShadowRoot()->setShadowInsertionPointOfYoungerShadowRoot(shadowInsertionPoint);
         } else if (root->isOldest()) {
-            DistributionPool pool(shadowInsertionPoint);
+            if (shadowInsertionPoint->hasChildNodes())
+                pool.populateChildren(*shadowInsertionPoint);
             pool.distributeTo(shadowInsertionPoint, this);
         }
         if (ElementShadow* shadow = shadowWhereNodeCanBeDistributed(*shadowInsertionPoint))
             shadow->setNeedsDistributionRecalc();
     }
 }
 
 void ElementShadow::didDistributeNode(const Node* node, InsertionPoint* insertionPoint)
 {
     NodeToDestinationInsertionPoints::AddResult result = m_nodeToInsertionPoints.add(node, DestinationInsertionPoints());
     result.iterator->value.append(insertionPoint);
 }
 
 void ElementShadow::distributeNodeChildrenTo(InsertionPoint* insertionPoint, ContainerNode* containerNode)
 {
-    DistributionPool pool(containerNode);
+    DistributionPool pool(*containerNode);
     pool.distributeTo(insertionPoint, this);
 }
 
 const SelectRuleFeatureSet& ElementShadow::ensureSelectFeatureSet()
 {
     if (!m_needsSelectFeatureSet)
         return m_selectFeatures;
 
     m_selectFeatures.clear();
     for (ShadowRoot* root = oldestShadowRoot(); root; root = root->youngerShadowRoot())
@@ skipping 38 matching lines @@
 
 void ElementShadow::clearDistribution()
 {
     m_nodeToInsertionPoints.clear();
 
     for (ShadowRoot* root = youngestShadowRoot(); root; root = root->olderShadowRoot())
         root->setShadowInsertionPointOfYoungerShadowRoot(0);
 }
 
 } // namespace