Merge ShadowRootRareData into ShadowRoot.

sky/engine/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 152 matching lines @@
 }
 
 void InsertionPoint::insertedInto(ContainerNode* insertionPoint)
 {
     HTMLElement::insertedInto(insertionPoint);
     if (ShadowRoot* root = containingShadowRoot()) {
         if (ElementShadow* rootOwner = root->owner()) {
             rootOwner->setNeedsDistributionRecalc();
             if (canBeActive() && !m_registeredWithShadowRoot && insertionPoint->treeScope().rootNode() == root) {
                 m_registeredWithShadowRoot = true;
-                root->didAddInsertionPoint(this);
+                root->didAddInsertionPoint();
                 if (canAffectSelector())
                     rootOwner->willAffectSelector();
             }
         }
     }
 }
 
 void InsertionPoint::removedFrom(ContainerNode* insertionPoint)
 {
     ShadowRoot* root = containingShadowRoot();
     if (!root)
         root = insertionPoint->containingShadowRoot();
 
     if (root) {
         if (ElementShadow* rootOwner = root->owner())
             rootOwner->setNeedsDistributionRecalc();
     }
 
     // host can be null when removedFrom() is called from ElementShadow destructor.
     ElementShadow* rootOwner = root ? root->owner() : 0;
 
     // Since this insertion point is no longer visible from the shadow subtree, it need to clean itself up.
     clearDistribution();
 
     if (m_registeredWithShadowRoot && insertionPoint->treeScope().rootNode() == root) {
         ASSERT(root);
         m_registeredWithShadowRoot = false;
-        root->didRemoveInsertionPoint(this);
+        root->didRemoveInsertionPoint();
         if (rootOwner) {
             if (canAffectSelector())
                 rootOwner->willAffectSelector();
         }
     }
 
     HTMLElement::removedFrom(insertionPoint);
 }
 
 const InsertionPoint* resolveReprojection(const Node* projectedNode)
@@ skipping 30 matching lines @@
         if (!insertionPoints)
             return;
         for (size_t i = 0; i < insertionPoints->size(); ++i)
             results.append(insertionPoints->at(i).get());
         ASSERT(current != insertionPoints->last().get());
         current = insertionPoints->last().get();
     }
 }
 
 } // namespace blink