Title: [153682] branches/safari-537-branch/Source/WebCore
- Revision
- 153682
- Author
- [email protected]
- Date
- 2013-08-02 17:24:11 -0700 (Fri, 02 Aug 2013)
Log Message
Merged r153632. <rdar://problem/14628760>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153681 => 153682)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-03 00:06:31 UTC (rev 153681)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-03 00:24:11 UTC (rev 153682)
@@ -1,5 +1,24 @@
2013-08-02 Lucas Forschler <[email protected]>
+ Merge r153632
+
+ 2013-07-31 Ryosuke Niwa <[email protected]>
+
+ FormAssociatedElement shouldn't create out-of-tree FormAttributeTargetObserver
+ https://bugs.webkit.org/show_bug.cgi?id=119309
+
+ Reviewed by Kent Tamura.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/6fbdcbf311de539107bc28711b3f7a527176e97b.
+
+ I'm not merging the test since the attached test case only works when the shadow DOM API is enabled.
+
+ * html/FormAssociatedElement.cpp:
+ (WebCore::FormAssociatedElement::formAttributeChanged):
+ (WebCore::FormAssociatedElement::resetFormAttributeTargetObserver):
+
+2013-08-02 Lucas Forschler <[email protected]>
+
Merge r153641
2013-08-01 Andreas Kling <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/html/FormAssociatedElement.cpp (153681 => 153682)
--- branches/safari-537-branch/Source/WebCore/html/FormAssociatedElement.cpp 2013-08-03 00:06:31 UTC (rev 153681)
+++ branches/safari-537-branch/Source/WebCore/html/FormAssociatedElement.cpp 2013-08-03 00:24:11 UTC (rev 153682)
@@ -179,7 +179,8 @@
m_formAttributeTargetObserver = nullptr;
} else {
resetFormOwner();
- resetFormAttributeTargetObserver();
+ if (element->inDocument())
+ resetFormAttributeTargetObserver();
}
}
@@ -253,6 +254,7 @@
void FormAssociatedElement::resetFormAttributeTargetObserver()
{
+ ASSERT(toHTMLElement(this)->inDocument());
m_formAttributeTargetObserver = FormAttributeTargetObserver::create(toHTMLElement(this)->fastGetAttribute(formAttr), this);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
