Changeset 47171 in webkit

Timestamp:

Aug 12, 2009 6:00:41 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-12 Alpha Lam <​hclam@chromium.org>

Reviewed by Simon Fraser.

Fix regression for dragging the media controller thumb.
​https://bugs.webkit.org/show_bug.cgi?id=28211

Add a layout test to make sure dragging the timebar thumb of media
controls causes seeks.

• media/controls-drag-timebar-expected.txt: Added.
• media/controls-drag-timebar.html: Added.

2009-08-12 Alpha Lam <​hclam@chromium.org>

Reviewed by Simon Fraser.

Fix regression for dragging the media controller thumb.
​https://bugs.webkit.org/show_bug.cgi?id=28211

Modified the conditions for rejecting events on the media controller
to only rejecting mouse events not from the left button.

Test: media/controls-drag-timebar.html

• rendering/MediaControlElements.cpp: (WebCore::MediaControlTimelineElement::defaultEventHandler):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/controls-drag-timebar-expected.txt (added)
• LayoutTests/media/controls-drag-timebar.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/MediaControlElements.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-12  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Fix regression for dragging the media controller thumb.
+        https://bugs.webkit.org/show_bug.cgi?id=28211
+
+        Add a layout test to make sure dragging the timebar thumb of media
+        controls causes seeks.
+
+        * media/controls-drag-timebar-expected.txt: Added.
+        * media/controls-drag-timebar.html: Added.
+
 2009-08-12  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-12  Alpha Lam  <hclam@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        Fix regression for dragging the media controller thumb.
+        https://bugs.webkit.org/show_bug.cgi?id=28211
+
+        Modified the conditions for rejecting events on the media controller
+        to only rejecting mouse events not from the left button.
+
+        Test: media/controls-drag-timebar.html
+
+        * rendering/MediaControlElements.cpp:
+        (WebCore::MediaControlTimelineElement::defaultEventHandler):
+
 2009-08-12  Dumitru Daniliuc  <dumi@chromium.org>
 

trunk/WebCore/rendering/MediaControlElements.cpp

@@ -483 +483 @@
 void MediaControlTimelineElement::defaultEventHandler(Event* event)
 {
-    // Left button is 0. Accepts only if mouse event is from left button.
-    if (!event->isMouseEvent() || static_cast<MouseEvent*>(event)->button())
+    // Left button is 0. Rejects mouse events not from left button.
+    if (event->isMouseEvent() && static_cast<MouseEvent*>(event)->button())
         return;