Element::recalcStyle() overly reattach()-es InsertionPoints.

Source/core/dom/shadow/InsertionPoint.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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "core/dom/shadow/ShadowRoot.h"
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
 InsertionPoint::InsertionPoint(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document, CreateInsertionPoint)
     , m_registeredWithShadowRoot(false)
 {
+    setHasCustomStyleCallbacks();
 }
 
 InsertionPoint::~InsertionPoint()
 {
 }
 
 void InsertionPoint::attach(const AttachContext& context)
 {
     if (ShadowRoot* shadowRoot = containingShadowRoot())
-        ContentDistributor::ensureDistribution(shadowRoot);
+        shadowRoot->host()->ensureDistribution();
     for (size_t i = 0; i < m_distribution.size(); ++i) {
         if (!m_distribution.at(i)->attached())
             m_distribution.at(i)->attach(context);
     }
 
     HTMLElement::attach(context);
 }
 
 void InsertionPoint::detach(const AttachContext& context)
 {
     if (ShadowRoot* shadowRoot = containingShadowRoot())
-        ContentDistributor::ensureDistribution(shadowRoot);
+        shadowRoot->host()->ensureDistribution();
 
     for (size_t i = 0; i < m_distribution.size(); ++i)
         m_distribution.at(i)->detach(context);
 
     HTMLElement::detach(context);
 }
 
+void InsertionPoint::willRecalcStyle(StyleChange change)
+{
+    if (change < Inherit)
+        return;
+    if (ShadowRoot* shadowRoot = containingShadowRoot()) {
+        shadowRoot->host()->ensureDistribution();
+        shadowRoot->owner()->distributor().setNeedsStyleRecalcIfDistributedTo(this);
+    }
+}
+
 bool InsertionPoint::shouldUseFallbackElements() const
 {
     return isActive() && !hasDistribution();
 }
 
 bool InsertionPoint::isShadowBoundary() const
 {
     return treeScope()->rootNode()->isShadowRoot() && isActive();
 }
 
 bool InsertionPoint::isActive() const
 {
     if (!containingShadowRoot())
         return false;
     const Node* node = parentNode();
     while (node) {
         if (node->isInsertionPoint())
             return false;
 
         node = node->parentNode();
     }
     return true;
 }
 
 PassRefPtr<NodeList> InsertionPoint::getDistributedNodes() const
 {
     if (ShadowRoot* shadowRoot = containingShadowRoot())
-        ContentDistributor::ensureDistribution(shadowRoot);
+        shadowRoot->host()->ensureDistribution();
 
     Vector<RefPtr<Node> > nodes;
 
     for (size_t i = 0; i < m_distribution.size(); ++i)
         nodes.append(m_distribution.at(i));
 
     return StaticNodeList::adopt(nodes);
 }
 
 bool InsertionPoint::rendererIsNeeded(const NodeRenderingContext& context)
@@ skipping 84 matching lines @@
     return selectorList;
 }
 
 InsertionPoint* resolveReprojection(const Node* projectedNode)
 {
     InsertionPoint* insertionPoint = 0;
     const Node* current = projectedNode;
 
     while (current) {
         if (ElementShadow* shadow = shadowOfParentForDistribution(current)) {
+            shadow->host()->ensureDistribution();
             if (ShadowRoot* root = current->containingShadowRoot())
-                ContentDistributor::ensureDistribution(root);
+                root->host()->ensureDistribution();
             if (InsertionPoint* insertedTo = shadow->distributor().findInsertionPointFor(projectedNode)) {
                 current = insertedTo;
                 insertionPoint = insertedTo;
                 continue;
             }
         }
 
         if (Node* parent = parentNodeForDistribution(current)) {
             if (InsertionPoint* insertedTo = parent->isShadowRoot() ? ScopeContentDistribution::assignedTo(toShadowRoot(parent)) : 0) {
                 current = insertedTo;
                 insertionPoint = insertedTo;
                 continue;
             }
         }
 
         break;
     }
 
     return insertionPoint;
 }
 
 void collectInsertionPointsWhereNodeIsDistributed(const Node* node, Vector<InsertionPoint*, 8>& results)
 {
     const Node* current = node;
     while (true) {
         if (ElementShadow* shadow = shadowOfParentForDistribution(current)) {
             if (ShadowRoot* root = current->containingShadowRoot())
-                ContentDistributor::ensureDistribution(root);
+                root->host()->ensureDistribution();
             if (InsertionPoint* insertedTo = shadow->distributor().findInsertionPointFor(node)) {
                 current = insertedTo;
                 results.append(insertedTo);
                 continue;
             }
         }
         if (Node* parent = parentNodeForDistribution(current)) {
             if (InsertionPoint* insertedTo = parent->isShadowRoot() ? ScopeContentDistribution::assignedTo(toShadowRoot(parent)) : 0) {
                 current = insertedTo;
                 results.append(insertedTo);
                 continue;
             }
         }
         return;
     }
 }
 
 } // namespace WebCore