Rename Node::inShadowIncludingDocument() to Node::isConnected()

third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2007, 2008 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 347 matching lines @@
         if (child)
             insertNodeBefore(insertChild, child, editingState);
         else
             appendNode(insertChild, toContainerNode(refChild), editingState);
     } else if (caretMinOffset(refChild) >= offset) {
         insertNodeBefore(insertChild, refChild, editingState);
     } else if (refChild->isTextNode() && caretMaxOffset(refChild) > offset) {
         splitTextNode(toText(refChild), offset);
 
         // Mutation events (bug 22634) from the text node insertion may have removed the refChild
-        if (!refChild->inShadowIncludingDocument())
+        if (!refChild->isConnected())
             return;
         insertNodeBefore(insertChild, refChild, editingState);
     } else {
         insertNodeAfter(insertChild, refChild, editingState);
     }
 }
 
 void CompositeEditCommand::appendNode(Node* node, ContainerNode* parent, EditingState* editingState)
 {
     // When cloneParagraphUnderNewElement() clones the fallback content
@@ skipping 80 matching lines @@
 {
     // It would also be possible to implement all of ReplaceNodeWithSpanCommand
     // as a series of existing smaller edit commands.  Someone who wanted to
     // reduce the number of edit commands could do so here.
     ReplaceNodeWithSpanCommand* command = ReplaceNodeWithSpanCommand::create(node);
     // ReplaceNodeWithSpanCommand is never aborted.
     applyCommandToComposite(command, ASSERT_NO_EDITING_ABORT);
     // Returning a raw pointer here is OK because the command is retained by
     // applyCommandToComposite (thus retaining the span), and the span is also
     // in the DOM tree, and thus alive whie it has a parent.
-    DCHECK(command->spanElement()->inShadowIncludingDocument()) << command->spanElement();
+    DCHECK(command->spanElement()->isConnected()) << command->spanElement();
     return command->spanElement();
 }
 
 void CompositeEditCommand::prune(Node* node, EditingState* editingState, Node* excludeNode)
 {
     if (Node* highestNodeToRemove = highestNodeToRemoveInPruning(node, excludeNode))
         removeNode(highestNodeToRemove, editingState);
 }
 
 void CompositeEditCommand::splitTextNode(Text* node, unsigned offset)
@@ skipping 561 matching lines @@
     if (!anchorNode)
         return;
 
     DCHECK(anchorNode->isLink()) << anchorNode;
 
     setEndingSelection(VisibleSelection::selectionFromContentsOfNode(anchorNode));
     applyStyledElement(anchorNode, editingState);
     if (editingState->isAborted())
         return;
     // Clones of anchorNode have been pushed down, now remove it.
-    if (anchorNode->inShadowIncludingDocument())
+    if (anchorNode->isConnected())
         removeNodePreservingChildren(anchorNode, editingState);
 }
 
 // Clone the paragraph between start and end under blockElement,
 // preserving the hierarchy up to outerNode.
 
 void CompositeEditCommand::cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* passedOuterNode, Element* blockElement, EditingState* editingState)
 {
     DCHECK_LE(start, end);
     DCHECK(passedOuterNode);
@@ skipping 29 matching lines @@
             Node* child = item->cloneNode(isDisplayInsideTable(item));
             appendNode(child, toElement(lastNode), editingState);
             if (editingState->isAborted())
                 return;
             lastNode = child;
         }
     }
 
     // Scripts specified in javascript protocol may remove |outerNode|
     // during insertion, e.g. <iframe src="javascript:...">
-    if (!outerNode->inShadowIncludingDocument())
+    if (!outerNode->isConnected())
         return;
 
     // Handle the case of paragraphs with more than one node,
     // cloning all the siblings until end.anchorNode() is reached.
 
     if (start.anchorNode() != end.anchorNode() && !start.anchorNode()->isDescendantOf(end.anchorNode())) {
         // If end is not a descendant of outerNode we need to
         // find the first common ancestor to increase the scope
         // of our nextSibling traversal.
         while (outerNode && !end.anchorNode()->isDescendantOf(outerNode)) {
@@ skipping 196 matching lines @@
     }
 
     // FIXME (5098931): We should add a new insert action "WebViewInsertActionMoved" and call shouldInsertFragment here.
 
     setEndingSelection(VisibleSelection(start, end));
     document().frame()->spellChecker().clearMisspellingsAndBadGrammar(endingSelection());
     deleteSelection(editingState, false, false, false);
     if (editingState->isAborted())
         return;
 
-    DCHECK(destination.deepEquivalent().inShadowIncludingDocument()) << destination;
+    DCHECK(destination.deepEquivalent().isConnected()) << destination;
     cleanupAfterDeletion(editingState, destination);
     if (editingState->isAborted())
         return;
-    DCHECK(destination.deepEquivalent().inShadowIncludingDocument()) << destination;
+    DCHECK(destination.deepEquivalent().isConnected()) << destination;
 
     // Add a br if pruning an empty block level element caused a collapse. For example:
     // foo^
     // <div>bar</div>
     // baz
     // Imagine moving 'bar' to ^. 'bar' will be deleted and its div pruned. That would
     // cause 'baz' to collapse onto the line with 'foobar' unless we insert a br.
     // Must recononicalize these two VisiblePositions after the pruning above.
     VisiblePosition beforeParagraph = createVisiblePosition(beforeParagraphPosition.position());
     VisiblePosition afterParagraph = createVisiblePosition(afterParagraphPosition.position());
@@ skipping 290 matching lines @@
 }
 
 DEFINE_TRACE(CompositeEditCommand)
 {
     visitor->trace(m_commands);
     visitor->trace(m_composition);
     EditCommand::trace(visitor);
 }
 
 } // namespace blink