Refactor ElementShadow by separating v0 related features as ElementShadowV0

third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp

Index: third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
diff --git a/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp b/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
index efbda97fe25055fcf81b3700b0b79896bc4606b2..a2014ba761a62a63b925c2f55caa80a78e141768 100644
--- a/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
+++ b/third_party/WebKit/Source/core/dom/shadow/InsertionPoint.cpp
@@ -31,12 +31,13 @@
 #include "core/dom/shadow/InsertionPoint.h"
 
 #include "core/HTMLNames.h"
-#include "core/dom/Document.h"
+

[tkent, 2016/09/13 07:09:45]

nit: The blank line is unnecessary.

[hayato, 2016/09/13 07:14:56]

Done

 #include "core/dom/ElementTraversal.h"
 #include "core/dom/QualifiedName.h"
 #include "core/dom/StaticNodeList.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/dom/shadow/ElementShadow.h"
+#include "core/dom/shadow/ElementShadowV0.h"
 
 namespace blink {
 
@@ -204,13 +205,15 @@ Node::InsertionNotificationRequest InsertionPoint::insertedInto(ContainerNode* i
 {
     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);
-                if (canAffectSelector())
-                    rootOwner->willAffectSelector();
+        if (!root->isV1()) {
+            if (ElementShadow* rootOwner = root->owner()) {
+                rootOwner->setNeedsDistributionRecalc();
+                if (canBeActive() && !m_registeredWithShadowRoot && insertionPoint->treeScope().rootNode() == root) {
+                    m_registeredWithShadowRoot = true;
+                    root->didAddInsertionPoint(this);
+                    if (canAffectSelector())
+                        rootOwner->v0().willAffectSelector();
+                }
             }
         }
     }
@@ -243,9 +246,9 @@ void InsertionPoint::removedFrom(ContainerNode* insertionPoint)
         DCHECK(root);
         m_registeredWithShadowRoot = false;
         root->didRemoveInsertionPoint(this);
-        if (rootOwner) {
+        if (!root->isV1() && rootOwner) {
             if (canAffectSelector())
-                rootOwner->willAffectSelector();
+                rootOwner->v0().willAffectSelector();
         }
     }
 
@@ -269,7 +272,7 @@ const InsertionPoint* resolveReprojection(const Node* projectedNode)
         if (!shadow || shadow->isV1() || shadow == lastElementShadow)
             break;
         lastElementShadow = shadow;
-        const InsertionPoint* insertedTo = shadow->finalDestinationInsertionPointFor(projectedNode);
+        const InsertionPoint* insertedTo = shadow->v0().finalDestinationInsertionPointFor(projectedNode);
         if (!insertedTo)
             break;
         DCHECK_NE(current, insertedTo);
@@ -288,7 +291,7 @@ void collectDestinationInsertionPoints(const Node& node, HeapVector<Member<Inser
         if (!shadow || shadow->isV1() || shadow == lastElementShadow)
             return;
         lastElementShadow = shadow;
-        const DestinationInsertionPoints* insertionPoints = shadow->destinationInsertionPointsFor(&node);
+        const DestinationInsertionPoints* insertionPoints = shadow->v0().destinationInsertionPointsFor(&node);
         if (!insertionPoints)
             return;
         for (size_t i = 0; i < insertionPoints->size(); ++i)