Changeset 122286 in webkit

Timestamp:

Jul 10, 2012 6:47:58 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Input elements with type=range do not have default touch handlers.
​https://bugs.webkit.org/show_bug.cgi?id=88807

Patch by Kevin Ellis <​kevers@chromium.org> on 2012-07-10
Reviewed by Antonio Gomes.

Source/WebCore:

This patch adds support for touch event handling on input elements
and dragging a slider with touch start and move events. Previously,
manipulating a slider on a touch screen required generation of
synthetic mouse events.

Tests: fast/events/touch/touch-slider-no-js-touch-listener.html

fast/events/touch/touch-slider.html

• dom/Event.cpp:

(WebCore::Event::isTouchEvent):
(WebCore):

• dom/Event.h:

(Event):

• dom/Touch.cpp:

(WebCore::Touch::Touch):

• dom/Touch.h:

(WebCore::Touch::absoluteLocation):
(Touch):

• dom/TouchEvent.cpp:

(WebCore::TouchEvent::isTouchEvent):
(WebCore):

• dom/TouchEvent.h:

(TouchEvent):

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::HTMLInputElement):
(WebCore::HTMLInputElement::~HTMLInputElement):
(WebCore::HTMLInputElement::updateType):
(WebCore::HTMLInputElement::defaultEventHandler):

• html/HTMLInputElement.h:

(HTMLInputElement):

• html/InputType.cpp:

(WebCore):
(WebCore::InputType::handleTouchEvent):
(WebCore::InputType::hasTouchEventHandler):

• html/InputType.h:

(WebCore):
(ClickHandlingState):
(InputType):

• html/RangeInputType.cpp:

(WebCore):
(WebCore::RangeInputType::handleTouchEvent):
(WebCore::RangeInputType::hasTouchEventHandler):

• html/RangeInputType.h:

(RangeInputType):

• html/shadow/SliderThumbElement.h:

(SliderThumbElement):

Source/WebKit/chromium:

Adds flag to enable native handling of touch events for input elements
with type=range.

• features.gypi:

LayoutTests:

Add automated test for manipulating an input slider via touch
events.

• fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js: Added.

(checkPosition):

• fast/events/touch/script-tests/touch-slider.js: Added.

(onTouchStart):
(onTouchEnd):
(onKeyDown):
(checkPosition):

• fast/events/touch/touch-slider-expected.txt: Added.
• fast/events/touch/touch-slider-no-js-touch-listener-expected.txt: Added.
• fast/events/touch/touch-slider-no-js-touch-listener.html: Added.
• fast/events/touch/touch-slider.html: Added.
• platform/chromium/fast/events/touch/touch-slider-expected.txt: Added.
• platform/chromium/fast/events/touch/touch-slider-no-js-touch-listener-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js (added)
• LayoutTests/fast/events/touch/script-tests/touch-slider.js (added)
• LayoutTests/fast/events/touch/touch-slider-expected.txt (added)
• LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener-expected.txt (added)
• LayoutTests/fast/events/touch/touch-slider-no-js-touch-listener.html (added)
• LayoutTests/fast/events/touch/touch-slider.html (added)
• LayoutTests/platform/chromium/fast/events/touch/touch-slider-expected.txt (added)
• LayoutTests/platform/chromium/fast/events/touch/touch-slider-no-js-touch-listener-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Event.cpp (modified) (1 diff)
• Source/WebCore/dom/Event.h (modified) (1 diff)
• Source/WebCore/dom/Touch.cpp (modified) (2 diffs)
• Source/WebCore/dom/Touch.h (modified) (3 diffs)
• Source/WebCore/dom/TouchEvent.cpp (modified) (1 diff)
• Source/WebCore/dom/TouchEvent.h (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLInputElement.h (modified) (1 diff)
• Source/WebCore/html/InputType.cpp (modified) (2 diffs)
• Source/WebCore/html/InputType.h (modified) (4 diffs)
• Source/WebCore/html/RangeInputType.cpp (modified) (2 diffs)
• Source/WebCore/html/RangeInputType.h (modified) (1 diff)
• Source/WebCore/html/shadow/SliderThumbElement.h (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/features.gypi (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-10  Kevin Ellis  <kevers@chromium.org>
+
+        Input elements with type=range do not have default touch handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=88807
+
+        Reviewed by Antonio Gomes.
+
+        Add automated test for manipulating an input slider via touch
+        events.
+
+        * fast/events/touch/script-tests/touch-slider-no-js-touch-listener.js: Added.
+        (checkPosition):
+        * fast/events/touch/script-tests/touch-slider.js: Added.
+        (onTouchStart):
+        (onTouchEnd):
+        (onKeyDown):
+        (checkPosition):
+        * fast/events/touch/touch-slider-expected.txt: Added.
+        * fast/events/touch/touch-slider-no-js-touch-listener-expected.txt: Added.
+        * fast/events/touch/touch-slider-no-js-touch-listener.html: Added.
+        * fast/events/touch/touch-slider.html: Added.
+        * platform/chromium/fast/events/touch/touch-slider-expected.txt: Added.
+        * platform/chromium/fast/events/touch/touch-slider-no-js-touch-listener-expected.txt: Added.
+
 2012-07-10  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Kevin Ellis  <kevers@chromium.org>
+
+        Input elements with type=range do not have default touch handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=88807
+
+        Reviewed by Antonio Gomes.
+
+        This patch adds support for touch event handling on input elements
+        and dragging a slider with touch start and move events.  Previously,
+        manipulating a slider on a touch screen required generation of
+        synthetic mouse events.
+
+        Tests: fast/events/touch/touch-slider-no-js-touch-listener.html
+               fast/events/touch/touch-slider.html
+
+        * dom/Event.cpp:
+        (WebCore::Event::isTouchEvent):
+        (WebCore):
+        * dom/Event.h:
+        (Event):
+        * dom/Touch.cpp:
+        (WebCore::Touch::Touch):
+        * dom/Touch.h:
+        (WebCore::Touch::absoluteLocation):
+        (Touch):
+        * dom/TouchEvent.cpp:
+        (WebCore::TouchEvent::isTouchEvent):
+        (WebCore):
+        * dom/TouchEvent.h:
+        (TouchEvent):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::HTMLInputElement):
+        (WebCore::HTMLInputElement::~HTMLInputElement):
+        (WebCore::HTMLInputElement::updateType):
+        (WebCore::HTMLInputElement::defaultEventHandler):
+        * html/HTMLInputElement.h:
+        (HTMLInputElement):
+        * html/InputType.cpp:
+        (WebCore):
+        (WebCore::InputType::handleTouchEvent):
+        (WebCore::InputType::hasTouchEventHandler):
+        * html/InputType.h:
+        (WebCore):
+        (ClickHandlingState):
+        (InputType):
+        * html/RangeInputType.cpp:
+        (WebCore):
+        (WebCore::RangeInputType::handleTouchEvent):
+        (WebCore::RangeInputType::hasTouchEventHandler):
+        * html/RangeInputType.h:
+        (RangeInputType):
+        * html/shadow/SliderThumbElement.h:
+        (SliderThumbElement):
+
 2012-07-10  Pravin D  <pravind.2k4@gmail.com>
 

trunk/Source/WebCore/dom/Event.cpp

@@ -127 +127 @@
 }
 
+bool Event::isTouchEvent() const
+{
+    return false;
+}
+
 bool Event::isDragEvent() const
 {

trunk/Source/WebCore/dom/Event.h

@@ -121 +121 @@
         virtual bool isMouseEvent() const;
         virtual bool isKeyboardEvent() const;
+        virtual bool isTouchEvent() const;
 
         // Drag events are a subset of mouse events.

trunk/Source/WebCore/dom/Touch.cpp

@@ -30 +30 @@
 #include "Touch.h"
 
+#include "DOMWindow.h"
 #include "Frame.h"
 #include "FrameView.h"
@@ -69 +70 @@
     , m_force(force)
 {
+    float scaleFactor = frame->pageZoomFactor() * frame->frameScaleFactor();
+    float x = pageX * scaleFactor;
+    float y = pageY * scaleFactor;
+    m_absoluteLocation = roundedLayoutPoint(FloatPoint(x, y));
 }
 

trunk/Source/WebCore/dom/Touch.h

@@ -30 +30 @@
 
 #include "EventTarget.h"
+#include "LayoutTypes.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -60 +61 @@
     float webkitRotationAngle() const { return m_rotationAngle; }
     float webkitForce() const { return m_force; }
+    const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
 
 private:
@@ -78 +80 @@
     float m_rotationAngle;
     float m_force;
+    LayoutPoint m_absoluteLocation;
 };
 

trunk/Source/WebCore/dom/TouchEvent.cpp

@@ -95 +95 @@
 }
 
+bool TouchEvent::isTouchEvent() const
+{
+    return true;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/dom/TouchEvent.h

@@ -70 +70 @@
     bool isTouchHold() const { return m_touchHold; }
 #endif
+    virtual bool isTouchEvent() const OVERRIDE;
 
     virtual const AtomicString& interfaceName() const;

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -68 +68 @@
 #endif
 
+#if ENABLE(TOUCH_EVENTS)
+#include "TouchEvent.h"
+#endif
+
 using namespace std;
 
@@ -99 +103 @@
     , m_wasModifiedByUser(false)
     , m_canReceiveDroppedFiles(false)
+    , m_hasTouchEventHandler(false)
     , m_inputType(InputType::createText(this))
 {
@@ -131 +136 @@
     if (isRadioButton())
         document()->formController()->checkedRadioButtons().removeButton(this);
+#if ENABLE(TOUCH_EVENTS)
+    if (m_hasTouchEventHandler)
+        document()->didRemoveTouchEventHandler();
+#endif
 }
 
@@ -401 +410 @@
     m_inputType = newType.release();
     m_inputType->createShadowSubtree();
+
+#if ENABLE(TOUCH_EVENTS)
+    bool hasTouchEventHandler = m_inputType->hasTouchEventHandler();
+    if (hasTouchEventHandler != m_hasTouchEventHandler) {
+      if (hasTouchEventHandler) {
+        document()->didAddTouchEventHandler();
+        document()->addListenerType(Document::TOUCH_LISTENER);
+      } else
+        document()->didRemoveTouchEventHandler();
+      m_hasTouchEventHandler = hasTouchEventHandler;
+    }
+#endif
 
     setNeedsWillValidateCheck();
@@ -1039 +1060 @@
     }
 
+#if ENABLE(TOUCH_EVENTS)
+    if (evt->isTouchEvent()) {
+        m_inputType->handleTouchEvent(static_cast<TouchEvent*>(evt));
+        if (evt->defaultHandled())
+            return;
+    }
+#endif
+
     if (evt->isKeyboardEvent() && evt->type() == eventNames().keydownEvent) {
         m_inputType->handleKeydownEvent(static_cast<KeyboardEvent*>(evt));

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -391 +391 @@
     bool m_wasModifiedByUser : 1;
     bool m_canReceiveDroppedFiles : 1;
+    bool m_hasTouchEventHandler: 1;
     OwnPtr<InputType> m_inputType;
 };

trunk/Source/WebCore/html/InputType.cpp

@@ -418 +418 @@
 }
 
+#if ENABLE(TOUCH_EVENTS)
+void InputType::handleTouchEvent(TouchEvent*)
+{
+}
+#endif
+
 void InputType::forwardEvent(Event*)
 {
@@ -873 +879 @@
 {
 }
+
+#if ENABLE(TOUCH_EVENTS)
+bool InputType::hasTouchEventHandler() const
+{
+    return false;
+}
+#endif
 
 String InputType::defaultToolTip() const

trunk/Source/WebCore/html/InputType.h

@@ -62 +62 @@
 class RenderObject;
 class RenderStyle;
+class TouchEvent;
 class WheelEvent;
 
@@ -68 +69 @@
 struct ClickHandlingState {
     WTF_MAKE_FAST_ALLOCATED;
+  
 public:
     bool checked;
@@ -191 +193 @@
     virtual void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*);
     virtual void handleWheelEvent(WheelEvent*);
+#if ENABLE(TOUCH_EVENTS)
+    virtual void handleTouchEvent(TouchEvent*);
+#endif
     virtual void forwardEvent(Event*);
     // Helpers for event handlers.
@@ -203 +208 @@
     virtual bool canBeSuccessfulSubmitButton();
     virtual void subtreeHasChanged();
+#if ENABLE(TOUCH_EVENTS)
+    virtual bool hasTouchEventHandler() const;
+#endif
 
     // Shadow tree handling

trunk/Source/WebCore/html/RangeInputType.cpp

@@ -50 +50 @@
 #include <wtf/PassOwnPtr.h>
 
+#if ENABLE(TOUCH_EVENTS)
+#include "Touch.h"
+#include "TouchEvent.h"
+#include "TouchList.h"
+#endif
+
 namespace WebCore {
 
@@ -134 +140 @@
     thumb->dragFrom(event->absoluteLocation());
 }
+
+#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(TOUCH_SLIDER)
+void RangeInputType::handleTouchEvent(TouchEvent* event)
+{
+    if (element()->disabled() || element()->readOnly())
+        return;
+
+    if (event->type() == eventNames().touchendEvent) {
+        event->setDefaultHandled();
+        return;
+    }
+
+    TouchList* touches = event->targetTouches();
+    if (touches->length() == 1) {
+        Touch* touch = touches->item(0);
+        SliderThumbElement* thumb = sliderThumbElementOf(element());
+        thumb->setPositionFromPoint(touch->absoluteLocation());
+        event->setDefaultHandled();
+    }
+}
+
+bool RangeInputType::hasTouchEventHandler() const
+{
+    return true;
+}
+#endif
+#endif
 
 void RangeInputType::handleKeydownEvent(KeyboardEvent* event)

trunk/Source/WebCore/html/RangeInputType.h

@@ -52 +52 @@
     virtual bool isSteppable() const OVERRIDE;
     virtual void handleMouseDownEvent(MouseEvent*) OVERRIDE;
+#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(TOUCH_SLIDER)
+    virtual void handleTouchEvent(TouchEvent*) OVERRIDE;
+    virtual bool hasTouchEventHandler() const OVERRIDE;
+#endif
+#endif
     virtual void handleKeydownEvent(KeyboardEvent*) OVERRIDE;
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*) const OVERRIDE;

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

@@ -58 +58 @@
     virtual const AtomicString& shadowPseudoId() const;
     HTMLInputElement* hostInput() const;
+    void setPositionFromPoint(const LayoutPoint&);
 
 private:
@@ -68 +69 @@
     void startDragging();
     void stopDragging();
-    void setPositionFromPoint(const LayoutPoint&);
 
     bool m_inDragMode;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-07-10  Kevin Ellis  <kevers@chromium.org>
+
+        Input elements with type=range do not have default touch handlers.
+        https://bugs.webkit.org/show_bug.cgi?id=88807
+
+        Reviewed by Antonio Gomes.
+
+        Adds flag to enable native handling of touch events for input elements
+        with type=range.
+
+        * features.gypi:
+
 2012-07-10  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebKit/chromium/features.gypi

@@ -98 +98 @@
       'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
       'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
+      'ENABLE_TOUCH_SLIDER=1',
       'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
       'ENABLE_VIDEO=1',