Changeset 87655 in webkit
- Timestamp:
- May 29, 2011 5:00:34 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87645 r87655 1 2011-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 1 26 2011-05-29 Andreas Kling <kling@webkit.org> 2 27 -
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp
r87622 r87655 78 78 void* MediaControlElement::preDispatchEventHandler(Event* event) 79 79 { 80 if (event->type() == eventNames().clickEvent) 80 if (event->type() == eventNames().clickEvent) { 81 event->preventDefault(); 81 82 event->stopPropagation(); 82 83 } 83 84 return 0; 84 85 } … … 334 335 if (event->type() == eventNames().clickEvent) { 335 336 mediaElement()->setMuted(!mediaElement()->muted()); 337 event->preventDefault(); 336 338 event->stopPropagation(); 337 339 } … … 420 422 mediaElement()->togglePlayState(); 421 423 updateDisplayType(); 424 event->preventDefault(); 422 425 event->stopPropagation(); 423 426 } … … 455 458 mediaElement()->pause(event->fromUserGesture()); 456 459 m_seekTimer.startRepeating(cSeekRepeatDelay); 460 event->preventDefault(); 457 461 event->stopPropagation(); 458 462 } else if (event->type() == eventNames().mouseupEvent) { … … 470 474 m_seekTimer.stop(); 471 475 m_seeking = false; 476 event->preventDefault(); 472 477 event->stopPropagation(); 473 478 } … … 551 556 if (event->type() == eventNames().clickEvent) { 552 557 mediaElement()->rewind(30); 558 event->preventDefault(); 553 559 event->stopPropagation(); 554 560 } … … 581 587 if (event->type() == eventNames().clickEvent) { 582 588 mediaElement()->returnToRealtime(); 589 event->preventDefault(); 583 590 event->stopPropagation(); 584 591 } … … 613 620 setChecked(mediaElement()->closedCaptionsVisible()); 614 621 updateDisplayType(); 622 event->preventDefault(); 615 623 event->stopPropagation(); 616 624 } … … 811 819 #endif 812 820 mediaElement()->enterFullscreen(); 821 event->preventDefault(); 813 822 event->stopPropagation(); 814 823 } … … 841 850 ExceptionCode code = 0; 842 851 mediaElement()->setVolume(0, code); 852 event->preventDefault(); 843 853 event->stopPropagation(); 844 854 } … … 871 881 ExceptionCode code = 0; 872 882 mediaElement()->setVolume(1, code); 883 event->preventDefault(); 873 884 event->stopPropagation(); 874 885 }
Note: See TracChangeset
for help on using the changeset viewer.