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

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 489 matching lines @@
 }
 
 PositionInFlatTree toPositionInFlatTree(const Position& pos) {
   if (pos.isNull())
     return PositionInFlatTree();
 
   Node* const anchor = pos.anchorNode();
   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) {
       if (anchor->isShadowRoot())
         return PositionInFlatTree(anchor->ownerShadowHost(),
                                   PositionAnchorType::AfterChildren);
       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);
     }
     if (Node* parent = FlatTreeTraversal::parent(*child))
       return PositionInFlatTree(parent, FlatTreeTraversal::index(*child));
     // When |pos| isn't appeared in flat tree, we map |pos| to after
     // children of shadow host.
     // e.g. "foo",0 in <progress>foo</progress>
     if (anchor->isShadowRoot())
@@ skipping 141 matching lines @@
 }
 
 void showTree(const blink::Position* pos) {
   if (pos)
     pos->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null>";
 }
 
 #endif