Make slots in non-shadow trees participate in a flat tree

third_party/WebKit/Source/core/editing/Position.cpp

Index: third_party/WebKit/Source/core/editing/Position.cpp
diff --git a/third_party/WebKit/Source/core/editing/Position.cpp b/third_party/WebKit/Source/core/editing/Position.cpp
index 8567a2c998715f86b440feb36367cd8bf7b082ad..10618ddcec401e5f384862c4f8b1f4d5b070b897 100644
--- a/third_party/WebKit/Source/core/editing/Position.cpp
+++ b/third_party/WebKit/Source/core/editing/Position.cpp
@@ -507,7 +507,7 @@ PositionInFlatTree toPositionInFlatTree(const Position& pos) {
   if (pos.isOffsetInAnchor()) {
     if (anchor->isCharacterDataNode())
       return PositionInFlatTree(anchor, pos.computeOffsetInContainerNode());
-    DCHECK(!anchor->isSlotOrActiveInsertionPoint());
+    DCHECK(!anchor->isActiveSlotOrActiveInsertionPoint());
     int offset = pos.computeOffsetInContainerNode();
     Node* child = NodeTraversal::childAt(*anchor, offset);
     if (!child) {
@@ -517,7 +517,7 @@ PositionInFlatTree toPositionInFlatTree(const Position& pos) {
       return PositionInFlatTree(anchor, PositionAnchorType::AfterChildren);
     }
     child->updateDistribution();
-    if (child->isSlotOrActiveInsertionPoint()) {
+    if (child->isActiveSlotOrActiveInsertionPoint()) {
       if (anchor->isShadowRoot())
         return PositionInFlatTree(anchor->ownerShadowHost(), offset);
       return PositionInFlatTree(anchor, offset);