Changeset 104303 in webkit
- Timestamp:
- Jan 6, 2012 11:13:02 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r104302 r104303 1 2012-01-05 Jer Noble <jer.noble@apple.com> 2 3 Media Element: scrubbing in full-screen mode breaks playback. 4 https://bugs.webkit.org/show_bug.cgi?id=75650 5 6 Reviewed by John Sullivan. 7 8 * fullscreen/video-controls-timeline-expected.txt: Added. 9 * fullscreen/video-controls-timeline.html: Added. 10 1 11 2012-01-06 Jer Noble <jer.noble@apple.com> 2 12 -
trunk/Source/WebCore/ChangeLog
r104301 r104303 1 2012-01-05 Jer Noble <jer.noble@apple.com> 2 3 Media Element: scrubbing in full-screen mode breaks playback. 4 https://bugs.webkit.org/show_bug.cgi?id=75650 5 6 Reviewed by John Sullivan. 7 8 Test: fullscreen/video-controls-timeline.html 9 10 Only begin scrubbing if the panel itself is the mousedown event target. 11 12 * html/shadow/MediaControlElements.cpp: 13 (WebCore::MediaControlPanelElement::defaultEventHandler): 14 1 15 2012-01-05 Jer Noble <jer.noble@apple.com> 2 16 -
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp
r104301 r104303 237 237 if (event->isMouseEvent()) { 238 238 LayoutPoint location = static_cast<MouseEvent*>(event)->absoluteLocation(); 239 if (event->type() == eventNames().mousedownEvent ) {239 if (event->type() == eventNames().mousedownEvent && event->target() == this) { 240 240 startDrag(location); 241 241 event->setDefaultHandled(); 242 } else if (event->type() == eventNames().mousemoveEvent )242 } else if (event->type() == eventNames().mousemoveEvent && m_isBeingDragged) 243 243 continueDrag(location); 244 else if (event->type() == eventNames().mouseupEvent ) {244 else if (event->type() == eventNames().mouseupEvent && m_isBeingDragged) { 245 245 continueDrag(location); 246 246 endDrag();
Note: See TracChangeset
for help on using the changeset viewer.