Title: [199421] releases/WebKitGTK/webkit-2.12
- Revision
- 199421
- Author
- [email protected]
- Date
- 2016-04-13 00:37:03 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198451 - ASSERTION FAILED: m_isValid == valid() in WebCore::HTMLFormControlElement::isValidFormControlElement
https://bugs.webkit.org/show_bug.cgi?id=139481
Reviewed by Daniel Bates.
Source/WebCore:
Test: fast/forms/validity-assertion-inserting-into-datalist.html
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::insertedInto): Set the flags that will cause
"will validate" to be recomputed *before* calling willValidate().
LayoutTests:
* fast/forms/validity-assertion-inserting-into-datalist-expected.txt: Added.
* fast/forms/validity-assertion-inserting-into-datalist.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199420 => 199421)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 07:35:08 UTC (rev 199420)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-13 07:37:03 UTC (rev 199421)
@@ -1,3 +1,13 @@
+2016-03-18 Darin Adler <[email protected]>
+
+ ASSERTION FAILED: m_isValid == valid() in WebCore::HTMLFormControlElement::isValidFormControlElement
+ https://bugs.webkit.org/show_bug.cgi?id=139481
+
+ Reviewed by Daniel Bates.
+
+ * fast/forms/validity-assertion-inserting-into-datalist-expected.txt: Added.
+ * fast/forms/validity-assertion-inserting-into-datalist.html: Added.
+
2016-03-18 Brent Fulgham <[email protected]>
Local file restrictions should not block sessionStorage access
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist-expected.txt (0 => 199421)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist-expected.txt 2016-04-13 07:37:03 UTC (rev 199421)
@@ -0,0 +1,3 @@
+Validity state depends on whether form element is in data list. Test passes if it does not hit validity assertion in a debug build.
+
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist.html (0 => 199421)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/forms/validity-assertion-inserting-into-datalist.html 2016-04-13 07:37:03 UTC (rev 199421)
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<p>Validity state depends on whether form element is in data list. Test passes if it does not hit validity assertion in a debug build.</p>
+<datalist>
+ <a>
+ <form>
+ <select required=""></select>
+ </a>
+</datalist>
\ No newline at end of file
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199420 => 199421)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 07:35:08 UTC (rev 199420)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 07:37:03 UTC (rev 199421)
@@ -1,3 +1,16 @@
+2016-03-18 Darin Adler <[email protected]>
+
+ ASSERTION FAILED: m_isValid == valid() in WebCore::HTMLFormControlElement::isValidFormControlElement
+ https://bugs.webkit.org/show_bug.cgi?id=139481
+
+ Reviewed by Daniel Bates.
+
+ Test: fast/forms/validity-assertion-inserting-into-datalist.html
+
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::insertedInto): Set the flags that will cause
+ "will validate" to be recomputed *before* calling willValidate().
+
2016-03-18 Brent Fulgham <[email protected]>
Local file restrictions should not block sessionStorage access
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLFormControlElement.cpp (199420 => 199421)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLFormControlElement.cpp 2016-04-13 07:35:08 UTC (rev 199420)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/HTMLFormControlElement.cpp 2016-04-13 07:37:03 UTC (rev 199421)
@@ -274,13 +274,12 @@
Node::InsertionNotificationRequest HTMLFormControlElement::insertedInto(ContainerNode& insertionPoint)
{
+ m_dataListAncestorState = Unknown;
+ setNeedsWillValidateCheck();
if (willValidate() && !isValidFormControlElement())
addInvalidElementToAncestorFromInsertionPoint(*this, &insertionPoint);
-
if (document().hasDisabledFieldsetElement())
setAncestorDisabled(computeIsDisabledByFieldsetAncestor());
- m_dataListAncestorState = Unknown;
- setNeedsWillValidateCheck();
HTMLElement::insertedInto(insertionPoint);
FormAssociatedElement::insertedInto(insertionPoint);
return InsertionShouldCallFinishedInsertingSubtree;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
