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

third_party/WebKit/Source/core/html/FormAssociatedElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 67 matching lines @@
     HTMLElement* element = toHTMLElement(this);
     if (element->fastHasAttribute(formAttr))
         setFormAttributeTargetObserver(nullptr);
 }
 
 void FormAssociatedElement::insertedInto(ContainerNode* insertionPoint)
 {
     if (!m_formWasSetByParser || !m_form || NodeTraversal::highestAncestorOrSelf(*insertionPoint) != NodeTraversal::highestAncestorOrSelf(*m_form.get()))
         resetFormOwner();
 
-    if (!insertionPoint->inShadowIncludingDocument())
+    if (!insertionPoint->isConnected())
         return;
 
     HTMLElement* element = toHTMLElement(this);
     if (element->fastHasAttribute(formAttr))
         resetFormAttributeTargetObserver();
 }
 
 void FormAssociatedElement::removedFrom(ContainerNode* insertionPoint)
 {
     HTMLElement* element = toHTMLElement(this);
-    if (insertionPoint->inShadowIncludingDocument() && element->fastHasAttribute(formAttr)) {
+    if (insertionPoint->isConnected() && element->fastHasAttribute(formAttr)) {
         setFormAttributeTargetObserver(nullptr);
         resetFormOwner();
         return;
     }
     // If the form and element are both in the same tree, preserve the connection to the form.
     // Otherwise, null out our form and remove ourselves from the form's list of elements.
     if (m_form && NodeTraversal::highestAncestorOrSelf(*element) != NodeTraversal::highestAncestorOrSelf(*m_form.get()))
         resetFormOwner();
 }
 
 HTMLFormElement* FormAssociatedElement::findAssociatedForm(const HTMLElement* element)
 {
     const AtomicString& formId(element->fastGetAttribute(formAttr));
     // 3. If the element is reassociateable, has a form content attribute, and
     // is itself in a Document, then run these substeps:
-    if (!formId.isNull() && element->inShadowIncludingDocument()) {
+    if (!formId.isNull() && element->isConnected()) {
         // 3.1. If the first element in the Document to have an ID that is
         // case-sensitively equal to the element's form content attribute's
         // value is a form element, then associate the form-associated element
         // with that form element.
         // 3.2. Abort the "reset the form owner" steps.
         Element* newFormCandidate = element->treeScope().getElementById(formId);
         return isHTMLFormElement(newFormCandidate) ? toHTMLFormElement(newFormCandidate) : 0;
     }
     // 4. Otherwise, if the form-associated element in question has an ancestor
     // form element, then associate the form-associated element with the nearest
     // such ancestor form element.
     return element->findFormAncestor();
 }
 
 void FormAssociatedElement::formRemovedFromTree(const Node& formRoot)
 {
     ASSERT(m_form);
     if (NodeTraversal::highestAncestorOrSelf(toHTMLElement(*this)) == formRoot)
         return;
     resetFormOwner();
 }
 
 void FormAssociatedElement::associateByParser(HTMLFormElement* form)
 {
-    if (form && form->inShadowIncludingDocument()) {
+    if (form && form->isConnected()) {
         m_formWasSetByParser = true;
         setForm(form);
         form->didAssociateByParser();
     }
 }
 
 void FormAssociatedElement::setForm(HTMLFormElement* newForm)
 {
     if (m_form.get() == newForm)
         return;
     willChangeForm();
     if (m_form)
         m_form->disassociate(*this);
     if (newForm) {
         m_form = newForm;
         m_form->associate(*this);
     } else {
         m_form = nullptr;
     }
     didChangeForm();
 }
 
 void FormAssociatedElement::willChangeForm()
 {
 }
 
 void FormAssociatedElement::didChangeForm()
 {
-    if (!m_formWasSetByParser && m_form && m_form->inShadowIncludingDocument()) {
+    if (!m_formWasSetByParser && m_form && m_form->isConnected()) {
         HTMLElement* element = toHTMLElement(this);
         element->document().didAssociateFormControl(element);
     }
 }
 
 void FormAssociatedElement::resetFormOwner()
 {
     m_formWasSetByParser = false;
     HTMLElement* element = toHTMLElement(this);
     const AtomicString& formId(element->fastGetAttribute(formAttr));
@@ skipping 97 matching lines @@
 {
     if (m_formAttributeTargetObserver)
         m_formAttributeTargetObserver->unregister();
     m_formAttributeTargetObserver = newObserver;
 }
 
 void FormAssociatedElement::resetFormAttributeTargetObserver()
 {
     HTMLElement* element = toHTMLElement(this);
     const AtomicString& formId(element->fastGetAttribute(formAttr));
-    if (!formId.isNull() && element->inShadowIncludingDocument())
+    if (!formId.isNull() && element->isConnected())
         setFormAttributeTargetObserver(FormAttributeTargetObserver::create(formId, this));
     else
         setFormAttributeTargetObserver(nullptr);
 }
 
 void FormAssociatedElement::formAttributeTargetChanged()
 {
     resetFormOwner();
 }
 
@@ skipping 47 matching lines @@
     visitor->trace(m_element);
     IdTargetObserver::trace(visitor);
 }
 
 void FormAttributeTargetObserver::idTargetChanged()
 {
     m_element->formAttributeTargetChanged();
 }
 
 } // namespace blink