Merge ContentDistributor into ElementShadow

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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/dom/shadow/InsertionPoint.h"
 
 #include "HTMLNames.h"
 #include "core/dom/QualifiedName.h"
 #include "core/dom/StaticNodeList.h"
 #include "core/dom/shadow/ElementShadow.h"
+#include "core/dom/shadow/ScopeContentDistribution.h"
 #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)
 {
@@ skipping 195 matching lines @@
     setBooleanAttribute(reset_style_inheritanceAttr, value);
 }
 
 InsertionPoint* resolveReprojection(const Node* projectedNode)
 {
     InsertionPoint* insertionPoint = 0;
     const Node* current = projectedNode;
 
     while (current) {
         if (ElementShadow* shadow = shadowOfParentForDistribution(current)) {
-            if (InsertionPoint* insertedTo = shadow->distributor().findInsertionPointFor(projectedNode)) {
+            if (InsertionPoint* insertedTo = shadow->findInsertionPointFor(projectedNode)) {
                 current = insertedTo;
                 insertionPoint = insertedTo;
                 continue;
             }
         }
 
         if (Node* parent = parentNodeForDistribution(current)) {
             if (InsertionPoint* insertedTo = parent->isShadowRoot() ? toShadowRoot(parent)->insertionPoint() : 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 (InsertionPoint* insertedTo = shadow->distributor().findInsertionPointFor(node)) {
+            if (InsertionPoint* insertedTo = shadow->findInsertionPointFor(node)) {
                 current = insertedTo;
                 results.append(insertedTo);
                 continue;
             }
         }
         if (Node* parent = parentNodeForDistribution(current)) {
             if (InsertionPoint* insertedTo = parent->isShadowRoot() ? toShadowRoot(parent)->insertionPoint() : 0) {
                 current = insertedTo;
                 results.append(insertedTo);
                 continue;
             }
         }
         return;
     }
 }
 
 } // namespace WebCore