[webkit-changes] [112547] trunk

Thu, 29 Mar 2012 11:11:47 -0700

Title: [112547] trunk
Revision
112547
Author
[email protected]
Date
2012-03-29 11:11:40 -0700 (Thu, 29 Mar 2012)

Log Message

<http://webkit.org/b/82558> Toggling <input type="range"> readonly or disabled state while active breaks all click events

Source/WebCore:

Test: fast/forms/range/range-drag-when-toggled-disabled.html

Patch by Joseph Pecoraro <[email protected]> on 2012-03-29
Reviewed by Kent Tamura.

* html/shadow/SliderThumbElement.cpp:
(WebCore::SliderThumbElement::defaultEventHandler):
A slider can toggle its readonly or disabled state while in the middle
of dragging, in those cases we should cancel the drag and perform cleanup.

LayoutTests:

Patch by Joseph Pecoraro <[email protected]> on 2012-03-29
Reviewed by Kent Tamura.

* fast/forms/range/range-drag-when-toggled-disabled-expected.txt: Added.
* fast/forms/range/range-drag-when-toggled-disabled.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (112546 => 112547)


--- trunk/LayoutTests/ChangeLog	2012-03-29 18:03:59 UTC (rev 112546)
+++ trunk/LayoutTests/ChangeLog	2012-03-29 18:11:40 UTC (rev 112547)
@@ -1,3 +1,12 @@
+2012-03-29  Joseph Pecoraro  <[email protected]>
+
+        <http://webkit.org/b/82558> Toggling <input type="range"> readonly or disabled state while active breaks all click events
+
+        Reviewed by Kent Tamura.
+
+        * fast/forms/range/range-drag-when-toggled-disabled-expected.txt: Added.
+        * fast/forms/range/range-drag-when-toggled-disabled.html: Added.
+
 2012-03-29  Enrica Casucci  <[email protected]>
 
         Updating test_expectations with new failures after r112484.

Added: trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled-expected.txt (0 => 112547)


--- trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled-expected.txt	2012-03-29 18:11:40 UTC (rev 112547)
@@ -0,0 +1,26 @@
+Test for dragging operations of <input type=range> when readonly or disabled are toggled.
+
+Tests for range dragging while it toggles to be readonly.
+readOnly=false, disabled=false
+PASS input.value is "100"
+PASS changeEventCounter is >= lastChangeEventCounter + 1
+PASS input.value is "0"
+PASS changeEventCounter is >= lastChangeEventCounter + 1
+readOnly=true
+PASS input.value is "0"
+PASS lastChangeEventCounter is changeEventCounter
+
+Tests for range dragging while it toggles to be disabled.
+readOnly=false, disabled=false
+PASS input.value is "100"
+PASS changeEventCounter is >= lastChangeEventCounter + 1
+PASS input.value is "0"
+PASS changeEventCounter is >= lastChangeEventCounter + 1
+disabled=true
+PASS input.value is "0"
+PASS lastChangeEventCounter is changeEventCounter
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Added: trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled.html (0 => 112547)


--- trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled.html	                        (rev 0)
+++ trunk/LayoutTests/fast/forms/range/range-drag-when-toggled-disabled.html	2012-03-29 18:11:40 UTC (rev 112547)
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p id="description">Test for dragging operations of &lt;input type=range&gt; when <code>readonly</code> or <code>disabled</code> are toggled.</p>
+<div id="console"></div>
+<input type="range" id="range1" min="0" max="100" value="50">
+<input type="range" id="range2" min="0" max="100" value="50">
+<script>
+
+var changeEventCounter = 0;
+var lastChangeEventCounter = changeEventCounter;
+function handleChange() {
+    changeEventCounter++;
+}
+
+var input = null;
+
+function testInput(id, field) {
+    if (!window.eventSender)
+        return;
+
+    input = document.getElementById(id);
+    input._onchange_ = handleChange;
+    input.focus();
+
+    var centerY = input.offsetTop + input.offsetHeight / 2;
+    var centerX = input.offsetLeft + input.offsetWidth / 2;
+    var leftEdgeX = input.offsetLeft + 1;
+    var rightEdgeX = input.offsetLeft + input.offsetWidth - 1;
+
+    function dragToLeftEdge() { eventSender.mouseMoveTo(leftEdgeX, centerY); }
+    function dragToRightEdge() { eventSender.mouseMoveTo(rightEdgeX, centerY); }
+    function dragToCenter() { eventSender.mouseMoveTo(centerX, centerY); }
+
+    function startDragFromCenter() {
+        eventSender.mouseMoveTo(centerX, centerY);
+        eventSender.mouseDown();
+    }
+
+    function stopDrag() {
+        eventSender.mouseUp();
+    }
+
+    startDragFromCenter();
+
+    // Drag from center, to right edge, to left edge.
+    debug('readOnly=false, disabled=false');
+    input.valueAsNumber = 50;
+    lastChangeEventCounter = changeEventCounter;
+    dragToRightEdge();
+    shouldBe('input.value', '"100"');
+    shouldBeGreaterThanOrEqual('changeEventCounter', 'lastChangeEventCounter + 1');
+    lastChangeEventCounter = changeEventCounter;
+    dragToLeftEdge();
+    shouldBe('input.value', '"0"');
+    shouldBeGreaterThanOrEqual('changeEventCounter', 'lastChangeEventCounter + 1');
+
+    // Toggle (readonly | disabled).
+    debug(field + '=true');
+    input[field] = true;
+
+    // Attempt to drag to right edge. Should not change.
+    lastChangeEventCounter = changeEventCounter;
+    dragToRightEdge();
+    shouldBe('input.value', '"0"');
+    shouldBe('lastChangeEventCounter', 'changeEventCounter');
+
+    stopDrag();
+}
+
+
+// We want all mouse moves sent immediately.
+window.eventSender.dragMode = false;
+
+debug('Tests for range dragging while it toggles to be readonly.');
+testInput('range1', 'readOnly');
+debug('');
+
+debug('Tests for range dragging while it toggles to be disabled.');
+testInput('range2', 'disabled');
+debug('');
+
+</script>
+<script src=""
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (112546 => 112547)


--- trunk/Source/WebCore/ChangeLog	2012-03-29 18:03:59 UTC (rev 112546)
+++ trunk/Source/WebCore/ChangeLog	2012-03-29 18:11:40 UTC (rev 112547)
@@ -1,3 +1,16 @@
+2012-03-29  Joseph Pecoraro  <[email protected]>
+
+        <http://webkit.org/b/82558> Toggling <input type="range"> readonly or disabled state while active breaks all click events
+
+        Test: fast/forms/range/range-drag-when-toggled-disabled.html
+
+        Reviewed by Kent Tamura.
+
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::defaultEventHandler):
+        A slider can toggle its readonly or disabled state while in the middle
+        of dragging, in those cases we should cancel the drag and perform cleanup.
+
 2012-03-29  Adam Klein  <[email protected]>
 
         Factor out common post-insertion logic in ContainerNode

Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (112546 => 112547)


--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp	2012-03-29 18:03:59 UTC (rev 112546)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp	2012-03-29 18:11:40 UTC (rev 112547)
@@ -278,6 +278,7 @@
     // Missing this kind of check is likely to occur elsewhere if adding it in each shadow element.
     HTMLInputElement* input = hostInput();
     if (!input || input->isReadOnlyFormControl() || !input->isEnabledFormControl()) {
+        stopDragging();
         HTMLDivElement::defaultEventHandler(event);
         return;
     }

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to