Changeset 87655 in webkit


Ignore:
Timestamp:
May 29, 2011 5:00:34 PM (13 years ago)
Author:
Darin Adler
Message:

2011-05-29 Darin Adler <Darin Adler>

Reviewed by Kevin Decker.

REGRESSION (r87622): In media documents, clicking the full screen button and the play button pauses the video
https://bugs.webkit.org/show_bug.cgi?id=61713

We need to come up with a way to regression-test these changes. Nothing at the moment.

The bug is that we removed calls to preventDefault, but we still do need to prevent
default handling of this event.

  • html/shadow/MediaControlElements.cpp: (WebCore::MediaControlElement::preDispatchEventHandler): Add back the preventDefault that was in here before r87622 as well as the stopPropagation that was added in r87622. (WebCore::MediaControlMuteButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlPlayButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlSeekButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlRewindButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlReturnToRealtimeButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlToggleClosedCaptionsButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlFullscreenButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlFullscreenVolumeMinButtonElement::preDispatchEventHandler): Ditto. (WebCore::MediaControlFullscreenVolumeMaxButtonElement::preDispatchEventHandler): Ditto.
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r87645 r87655  
     12011-05-29  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Kevin Decker.
     4
     5        REGRESSION (r87622): In media documents, clicking the full screen button and the play button pauses the video
     6        https://bugs.webkit.org/show_bug.cgi?id=61713
     7
     8        We need to come up with a way to regression-test these changes. Nothing at the moment.
     9
     10        The bug is that we removed calls to preventDefault, but we still do need to prevent
     11        default handling of this event.
     12
     13        * html/shadow/MediaControlElements.cpp:
     14        (WebCore::MediaControlElement::preDispatchEventHandler): Add back the preventDefault
     15        that was in here before r87622 as well as the stopPropagation that was added in r87622.
     16        (WebCore::MediaControlMuteButtonElement::preDispatchEventHandler): Ditto.
     17        (WebCore::MediaControlPlayButtonElement::preDispatchEventHandler): Ditto.
     18        (WebCore::MediaControlSeekButtonElement::preDispatchEventHandler): Ditto.
     19        (WebCore::MediaControlRewindButtonElement::preDispatchEventHandler): Ditto.
     20        (WebCore::MediaControlReturnToRealtimeButtonElement::preDispatchEventHandler): Ditto.
     21        (WebCore::MediaControlToggleClosedCaptionsButtonElement::preDispatchEventHandler): Ditto.
     22        (WebCore::MediaControlFullscreenButtonElement::preDispatchEventHandler): Ditto.
     23        (WebCore::MediaControlFullscreenVolumeMinButtonElement::preDispatchEventHandler): Ditto.
     24        (WebCore::MediaControlFullscreenVolumeMaxButtonElement::preDispatchEventHandler): Ditto.
     25
    1262011-05-29  Andreas Kling  <kling@webkit.org>
    227
  • trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

    r87622 r87655  
    7878void* MediaControlElement::preDispatchEventHandler(Event* event)
    7979{
    80     if (event->type() == eventNames().clickEvent)
     80    if (event->type() == eventNames().clickEvent) {
     81        event->preventDefault();
    8182        event->stopPropagation();
    82    
     83    }
    8384    return 0;
    8485}
     
    334335    if (event->type() == eventNames().clickEvent) {
    335336        mediaElement()->setMuted(!mediaElement()->muted());
     337        event->preventDefault();
    336338        event->stopPropagation();
    337339    }
     
    420422        mediaElement()->togglePlayState();
    421423        updateDisplayType();
     424        event->preventDefault();
    422425        event->stopPropagation();
    423426    }
     
    455458        mediaElement()->pause(event->fromUserGesture());
    456459        m_seekTimer.startRepeating(cSeekRepeatDelay);
     460        event->preventDefault();
    457461        event->stopPropagation();
    458462    } else if (event->type() == eventNames().mouseupEvent) {
     
    470474            m_seekTimer.stop();
    471475            m_seeking = false;
     476            event->preventDefault();
    472477            event->stopPropagation();
    473478        }
     
    551556    if (event->type() == eventNames().clickEvent) {
    552557        mediaElement()->rewind(30);
     558        event->preventDefault();
    553559        event->stopPropagation();
    554560    }   
     
    581587    if (event->type() == eventNames().clickEvent) {
    582588        mediaElement()->returnToRealtime();
     589        event->preventDefault();
    583590        event->stopPropagation();
    584591    }
     
    613620        setChecked(mediaElement()->closedCaptionsVisible());
    614621        updateDisplayType();
     622        event->preventDefault();
    615623        event->stopPropagation();
    616624    }
     
    811819#endif
    812820            mediaElement()->enterFullscreen();
     821        event->preventDefault();
    813822        event->stopPropagation();
    814823    }
     
    841850        ExceptionCode code = 0;
    842851        mediaElement()->setVolume(0, code);
     852        event->preventDefault();
    843853        event->stopPropagation();
    844854    }
     
    871881        ExceptionCode code = 0;
    872882        mediaElement()->setVolume(1, code);
     883        event->preventDefault();
    873884        event->stopPropagation();
    874885    }
Note: See TracChangeset for help on using the changeset viewer.