Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87663 => 87664)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-30 04:18:34 UTC (rev 87663)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-30 04:20:28 UTC (rev 87664)
@@ -1,5 +1,34 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87655.
+
+ 2011-05-29 Darin Adler <[email protected]>
+
+ 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.
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87661.
2011-05-29 Brian Weinstein <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlElements.cpp (87663 => 87664)
--- branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2011-05-30 04:18:34 UTC (rev 87663)
+++ branches/safari-534-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2011-05-30 04:20:28 UTC (rev 87664)
@@ -77,9 +77,10 @@
void* MediaControlElement::preDispatchEventHandler(Event* event)
{
- if (event->type() == eventNames().clickEvent)
+ if (event->type() == eventNames().clickEvent) {
+ event->preventDefault();
event->stopPropagation();
-
+ }
return 0;
}
@@ -337,6 +338,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->setMuted(!mediaElement()->muted());
+ event->preventDefault();
event->stopPropagation();
}
@@ -423,6 +425,7 @@
if (event->type() == eventNames().clickEvent) {
mediaElement()->togglePlayState();
updateDisplayType();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -458,6 +461,7 @@
}
mediaElement()->pause(event->fromUserGesture());
m_seekTimer.startRepeating(cSeekRepeatDelay);
+ event->preventDefault();
event->stopPropagation();
} else if (event->type() == eventNames().mouseupEvent) {
if (m_capturing)
@@ -473,6 +477,7 @@
}
m_seekTimer.stop();
m_seeking = false;
+ event->preventDefault();
event->stopPropagation();
}
}
@@ -554,6 +559,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->rewind(30);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -584,6 +590,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->returnToRealtime();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -616,6 +623,7 @@
mediaElement()->setClosedCaptionsVisible(!mediaElement()->closedCaptionsVisible());
setChecked(mediaElement()->closedCaptionsVisible());
updateDisplayType();
+ event->preventDefault();
event->stopPropagation();
}
@@ -814,6 +822,7 @@
} else
#endif
mediaElement()->enterFullscreen();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -844,6 +853,7 @@
if (event->type() == eventNames().clickEvent) {
ExceptionCode code = 0;
mediaElement()->setVolume(0, code);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -874,6 +884,7 @@
if (event->type() == eventNames().clickEvent) {
ExceptionCode code = 0;
mediaElement()->setVolume(1, code);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
