Changeset 91827 in webkit

Timestamp:

Jul 27, 2011 2:15:21 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Knob of a disabled or readonly range control should not be draggable.
​https://bugs.webkit.org/show_bug.cgi?id=54820

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-07-27
Reviewed by Kent Tamura.

Source/WebCore:

Made disabled or readonly range control undraggable.

Test: fast/forms/range-drag.html

• html/RangeInputType.cpp:

(WebCore::RangeInputType::handleMouseDownEvent):

Added check that the element is readonly or disabled.

• html/shadow/SliderThumbElement.cpp:

(WebCore::SliderThumbElement::defaultEventHandler): ditto.

LayoutTests:

Added tests to confirm disabled or readonly range control is undraggable.

• fast/forms/range-drag-expected.txt: Added.
• fast/forms/range-drag.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/range-drag-expected.txt (added)
• LayoutTests/fast/forms/range-drag.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/RangeInputType.cpp (modified) (2 diffs)
• Source/WebCore/html/shadow/SliderThumbElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-27  Shinya Kawanaka  <shinyak@google.com>
+
+        Knob of a disabled or readonly range control should not be draggable.
+        https://bugs.webkit.org/show_bug.cgi?id=54820
+
+        Reviewed by Kent Tamura.
+
+        Added tests to confirm disabled or readonly range control is undraggable.
+
+        * fast/forms/range-drag-expected.txt: Added.
+        * fast/forms/range-drag.html: Added.
+
 2011-07-27  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-27  Shinya Kawanaka  <shinyak@google.com>
+
+        Knob of a disabled or readonly range control should not be draggable.
+        https://bugs.webkit.org/show_bug.cgi?id=54820
+
+        Reviewed by Kent Tamura.
+
+        Made disabled or readonly range control undraggable.
+
+        Test: fast/forms/range-drag.html
+
+        * html/RangeInputType.cpp:
+        (WebCore::RangeInputType::handleMouseDownEvent):
+          Added check that the element is readonly or disabled.
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::defaultEventHandler): ditto.
+
 2011-07-27  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebCore/html/RangeInputType.cpp

@@ -154 +154 @@
 void RangeInputType::handleMouseDownEvent(MouseEvent* event)
 {
+    if (element()->disabled() || element()->readOnly())
+        return;
+
     Node* targetNode = event->target()->toNode();
     if (event->button() != LeftButton || !targetNode || (targetNode != element() && !targetNode->isDescendantOf(element()->shadowRoot())))
@@ -167 +170 @@
     if (element()->disabled() || element()->readOnly())
         return;
+
     const String& key = event->keyIdentifier();
 

trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

@@ -271 +271 @@
     }
 
+    // FIXME: Should handle this readonly/disabled check in more general way.
+    // 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()) {
+        HTMLDivElement::defaultEventHandler(event);
+        return;
+    }
+
     MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
     bool isLeftButton = mouseEvent->button() == LeftButton;
@@ -375 +383 @@
 
 }
-