Unreviewed build fix after r212025.

brentfulgham · brentfulgham · commit 0bbb05fe105c · 2017-02-10T02:34:17.000Z
inDocument -> isConnected * html/FormAssociatedElement.cpp: (WebCore::FormAssociatedElement::didMoveToNewDocument): (WebCore::FormAssociatedElement::resetFormAttributeTargetObserver): * html/HTMLFormElement.cpp: (WebCore::HTMLFormElement::formElementIndex): Canonical link: https://commits.webkit.org/185137@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@212032 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2017-02-09  Brent Fulgham  <bfulgham@apple.com>
+
+        Unreviewed build fix after r212025.
+
+        inDocument -> isConnected
+
+        * html/FormAssociatedElement.cpp:
+        (WebCore::FormAssociatedElement::didMoveToNewDocument):
+        (WebCore::FormAssociatedElement::resetFormAttributeTargetObserver):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::formElementIndex):
+
 2017-02-09  Chris Dumez  <cdumez@apple.com>
 
         Make sure Event keeps its current target element alive
diff --git a/Source/WebCore/html/FormAssociatedElement.cpp b/Source/WebCore/html/FormAssociatedElement.cpp
@@ -63,7 +63,7 @@ FormAssociatedElement::~FormAssociatedElement()
 void FormAssociatedElement::didMoveToNewDocument(Document&)
 {
     HTMLElement& element = asHTMLElement();
-    if (element.hasAttributeWithoutSynchronization(formAttr) && element.inDocument())
+    if (element.hasAttributeWithoutSynchronization(formAttr) && element.isConnected())
         resetFormAttributeTargetObserver();
 }
 
@@ -266,7 +266,7 @@ void FormAssociatedElement::setCustomValidity(const String& error)
 
 void FormAssociatedElement::resetFormAttributeTargetObserver()
 {
-    ASSERT_WITH_SECURITY_IMPLICATION(asHTMLElement().inDocument());
+    ASSERT_WITH_SECURITY_IMPLICATION(asHTMLElement().isConnected());
     m_formAttributeTargetObserver = std::make_unique<FormAttributeTargetObserver>(asHTMLElement().attributeWithoutSynchronization(formAttr), *this);
 }
 
diff --git a/Source/WebCore/html/HTMLFormElement.cpp b/Source/WebCore/html/HTMLFormElement.cpp
@@ -547,7 +547,7 @@ unsigned HTMLFormElement::formElementIndex(FormAssociatedElement* associatedElem
 
     // Treats separately the case where this element has the form attribute
     // for performance consideration.
-    if (associatedHTMLElement.hasAttributeWithoutSynchronization(formAttr) && associatedHTMLElement.inDocument()) {
+    if (associatedHTMLElement.hasAttributeWithoutSynchronization(formAttr) && associatedHTMLElement.isConnected()) {
         unsigned short position = compareDocumentPosition(associatedHTMLElement);
         ASSERT_WITH_SECURITY_IMPLICATION(!(position & DOCUMENT_POSITION_DISCONNECTED));
         if (position & DOCUMENT_POSITION_PRECEDING) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ FormAssociatedElement::~FormAssociatedElement()`
`63`	`63`	`void FormAssociatedElement::didMoveToNewDocument(Document&)`
`64`	`64`	`{`
`65`	`65`	`HTMLElement& element = asHTMLElement();`
`66`		`- if (element.hasAttributeWithoutSynchronization(formAttr) && element.inDocument())`
	`66`	`+ if (element.hasAttributeWithoutSynchronization(formAttr) && element.isConnected())`
`67`	`67`	`resetFormAttributeTargetObserver();`
`68`	`68`	`}`
`69`	`69`
`@@ -266,7 +266,7 @@ void FormAssociatedElement::setCustomValidity(const String& error)`
`266`	`266`
`267`	`267`	`void FormAssociatedElement::resetFormAttributeTargetObserver()`
`268`	`268`	`{`
`269`		`- ASSERT_WITH_SECURITY_IMPLICATION(asHTMLElement().inDocument());`
	`269`	`+ ASSERT_WITH_SECURITY_IMPLICATION(asHTMLElement().isConnected());`
`270`	`270`	`m_formAttributeTargetObserver = std::make_unique<FormAttributeTargetObserver>(asHTMLElement().attributeWithoutSynchronization(formAttr), *this);`
`271`	`271`	`}`
`272`	`272`