Changeset 91333 in webkit


Ignore:
Timestamp:
Jul 19, 2011 9:46:35 PM (13 years ago)
Author:
tkent@chromium.org
Message:

REGRESSION(r89004): Video pauses and never resumes playing if scrubbed during playback.
https://bugs.webkit.org/show_bug.cgi?id=64314

Reviewed by Sam Weinig.

No new tests because it's hard to make a non-flaky test for this behavior.

  • html/RangeInputType.cpp:

(WebCore::RangeInputType::handleMouseDownEvent):
Don't call SliderThumbElement::dragFrom() for events on the thumb.

  • html/shadow/SliderThumbElement.cpp:

(WebCore::SliderThumbElement::defaultEventHandler):
Do not call setDefaultHandled() for mouse events in order to
propagate them to ancestor elements.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r91332 r91333  
     12011-07-19  Kent Tamura  <tkent@chromium.org>
     2
     3        REGRESSION(r89004): Video pauses and never resumes playing if scrubbed during playback.
     4        https://bugs.webkit.org/show_bug.cgi?id=64314
     5
     6        Reviewed by Sam Weinig.
     7
     8        No new tests because it's hard to make a non-flaky test for this behavior.
     9
     10        * html/RangeInputType.cpp:
     11        (WebCore::RangeInputType::handleMouseDownEvent):
     12        Don't call SliderThumbElement::dragFrom() for events on the thumb.
     13        * html/shadow/SliderThumbElement.cpp:
     14        (WebCore::SliderThumbElement::defaultEventHandler):
     15        Do not call setDefaultHandled() for mouse events in order to
     16        propagate them to ancestor elements.
     17
    1182011-07-19  Matthew Delaney  <mdelaney@apple.com>
    219
  • trunk/Source/WebCore/html/RangeInputType.cpp

    r90737 r91333  
    157157    if (event->button() != LeftButton || !targetNode || (targetNode != element() && !targetNode->isDescendantOf(element()->shadowRoot())))
    158158        return;
    159 
    160159    SliderThumbElement* thumb = sliderThumbElementOf(element());
     160    if (targetNode == thumb)
     161        return;
    161162    thumb->dragFrom(event->absoluteLocation());
    162     event->setDefaultHandled();
    163163}
    164164
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r89521 r91333  
    280280    const AtomicString& eventType = event->type();
    281281
     282    // We intentionally do not call event->setDefaultHandled() here because
     283    // MediaControlTimelineElement::defaultEventHandler() wants to handle these
     284    // mouse events.
    282285    if (eventType == eventNames().mousedownEvent && isLeftButton) {
    283286        startDragging();
    284         event->setDefaultHandled();
    285287        return;
    286288    } else if (eventType == eventNames().mouseupEvent && isLeftButton) {
    287289        stopDragging();
    288         event->setDefaultHandled();
    289290        return;
    290291    } else if (eventType == eventNames().mousemoveEvent) {
    291292        if (m_inDragMode)
    292293            setPositionFromPoint(mouseEvent->absoluteLocation());
    293         event->setDefaultHandled();
    294294        return;
    295295    }
Note: See TracChangeset for help on using the changeset viewer.