Refactor ElementShadow by separating v0 related features as ElementShadowV0

third_party/WebKit/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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 {
 
 using namespace HTMLNames;
 
 InsertionPoint::InsertionPoint(const QualifiedName& tagName, Document& document)
     : HTMLElement(tagName, document, CreateInsertionPoint)
     , m_registeredWithShadowRoot(false)
 {
     setHasCustomStyleCallbacks();
@@ skipping 147 matching lines @@
     if (ShadowRoot* root = containingShadowRoot()) {
         if (ElementShadow* rootOwner = root->owner())
             rootOwner->setNeedsDistributionRecalc();
     }
 }
 
 Node::InsertionNotificationRequest 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);
-                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();
+                }
             }
         }
     }
 
     // We could have been distributed into in a detached subtree, make sure to
     // clear the distribution when inserted again to avoid cycles.
     clearDistribution();
 
     return InsertionDone;
 }
@@ skipping 12 matching lines @@
     // 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) {
         DCHECK(root);
         m_registeredWithShadowRoot = false;
         root->didRemoveInsertionPoint(this);
-        if (rootOwner) {
+        if (!root->isV1() && rootOwner) {
             if (canAffectSelector())
-                rootOwner->willAffectSelector();
+                rootOwner->v0().willAffectSelector();
         }
     }
 
     HTMLElement::removedFrom(insertionPoint);
 }
 
 DEFINE_TRACE(InsertionPoint)
 {
     visitor->trace(m_distributedNodes);
     HTMLElement::trace(visitor);
 }
 
 const InsertionPoint* resolveReprojection(const Node* projectedNode)
 {
     DCHECK(projectedNode);
     const InsertionPoint* insertionPoint = 0;
     const Node* current = projectedNode;
     ElementShadow* lastElementShadow = 0;
     while (true) {
         ElementShadow* shadow = shadowWhereNodeCanBeDistributedForV0(*current);
         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);
         current = insertedTo;
         insertionPoint = insertedTo;
     }
     return insertionPoint;
 }
 
 void collectDestinationInsertionPoints(const Node& node, HeapVector<Member<InsertionPoint>, 8>& results)
 {
     const Node* current = &node;
     ElementShadow* lastElementShadow = 0;
     while (true) {
         ElementShadow* shadow = shadowWhereNodeCanBeDistributedForV0(*current);
         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)
             results.append(insertionPoints->at(i).get());
         DCHECK_NE(current, insertionPoints->last().get());
         current = insertionPoints->last().get();
     }
 }
 
 } // namespace blink