Title: [189690] releases/WebKitGTK/webkit-2.10
Revision
189690
Author
carlo...@webkit.org
Date
2015-09-14 01:05:24 -0700 (Mon, 14 Sep 2015)

Log Message

Merge r188672 - Select validation does not correctly work when handling change event
https://bugs.webkit.org/show_bug.cgi?id=145869

Reviewed by Dean Jackson.

Source/WebCore:

When selecting an option in a <select> with validation that also has an onchange listener, calling
checkValidity() for the select within the onchange handler would produce incorrect results and (on
a debug build) crash at an assertion. This is because the change events were being dispatched before
form validity was updated. Making the validation step come before the change event dispatch fixes
this issue.

Test: fast/forms/onchange-select-check-validity.html

* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::selectOption): Update validity before dispatching change events.

LayoutTests:

Tests that checkValidity() returns correct results from within the onchange handler of a
<select> when the validity of the selected option changes.

* fast/forms/onchange-select-check-validity-expected.txt: Added.
* fast/forms/onchange-select-check-validity.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (189689 => 189690)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-09-14 07:59:48 UTC (rev 189689)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2015-09-14 08:05:24 UTC (rev 189690)
@@ -1,3 +1,16 @@
+2015-08-19  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        Select validation does not correctly work when handling change event
+        https://bugs.webkit.org/show_bug.cgi?id=145869
+
+        Reviewed by Dean Jackson.
+
+        Tests that checkValidity() returns correct results from within the onchange handler of a
+        <select> when the validity of the selected option changes.
+
+        * fast/forms/onchange-select-check-validity-expected.txt: Added.
+        * fast/forms/onchange-select-check-validity.html: Added.
+
 2015-08-19  Jinyoung Hur  <hur....@navercorp.com>
 
         GraphicsContext3D::activeTexture should not be called with zero-based index

Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity-expected.txt (0 => 189690)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity-expected.txt	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity-expected.txt	2015-09-14 08:05:24 UTC (rev 189690)
@@ -0,0 +1,4 @@
+
+The select's validity was initially false
+The select's validity was changed to true
+

Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity.html (0 => 189690)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/onchange-select-check-validity.html	2015-09-14 08:05:24 UTC (rev 189690)
@@ -0,0 +1,37 @@
+<html>
+<head>
+<script>
+    function log(message) {
+        document.getElementById("console").appendChild(document.createTextNode(message + "\n"));
+    }
+
+    function setupTest() {
+        var isValid = null;
+        var select = document.getElementById("validated-select");
+        select.focus();
+        function showFormValidity() {
+            isValid = select.checkValidity();
+        }
+        showFormValidity();
+        select.addEventListener("change", showFormValidity);
+
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            log("The select's validity was initially " + isValid);
+            eventSender.keyDown("1");
+            log("The select's validity was changed to " + isValid);
+        }
+    }
+</script>
+</head>
+
+<body _onload_="setupTest()">
+<form>
+<select name="validated-select" required="required" id="validated-select">
+    <option value="" selected="selected">Select a value</option>
+    <option value="1">1</option>
+</select>
+</form>
+<pre id="console"></pre>
+</body>
+</html>

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (189689 => 189690)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-09-14 07:59:48 UTC (rev 189689)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2015-09-14 08:05:24 UTC (rev 189690)
@@ -1,3 +1,21 @@
+2015-08-19  Wenson Hsieh  <wenson_hs...@apple.com>
+
+        Select validation does not correctly work when handling change event
+        https://bugs.webkit.org/show_bug.cgi?id=145869
+
+        Reviewed by Dean Jackson.
+
+        When selecting an option in a <select> with validation that also has an onchange listener, calling
+        checkValidity() for the select within the onchange handler would produce incorrect results and (on
+        a debug build) crash at an assertion. This is because the change events were being dispatched before
+        form validity was updated. Making the validation step come before the change event dispatch fixes
+        this issue.
+
+        Test: fast/forms/onchange-select-check-validity.html
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::selectOption): Update validity before dispatching change events.
+
 2015-08-19  Jinyoung Hur  <hur....@navercorp.com>
 
         GraphicsContext3D::activeTexture should not be called with zero-based index

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLSelectElement.cpp (189689 => 189690)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLSelectElement.cpp	2015-09-14 07:59:48 UTC (rev 189689)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/HTMLSelectElement.cpp	2015-09-14 08:05:24 UTC (rev 189690)
@@ -899,6 +899,7 @@
 
     scrollToSelection();
 
+    updateValidity();
     if (usesMenuList()) {
         m_isProcessingUserDrivenChange = flags & UserDriven;
         if (flags & DispatchChangeEvent)
@@ -910,8 +911,6 @@
                 downcast<RenderListBox>(*renderer).selectionChanged();
         }
     }
-
-    updateValidity();
 }
 
 int HTMLSelectElement::optionToListIndex(int optionIndex) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to