Title: [87655] trunk/Source/WebCore
- Revision
- 87655
- Author
- [email protected]
- Date
- 2011-05-29 17:00:34 -0700 (Sun, 29 May 2011)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (87654 => 87655)
--- trunk/Source/WebCore/ChangeLog 2011-05-29 22:14:49 UTC (rev 87654)
+++ trunk/Source/WebCore/ChangeLog 2011-05-30 00:00:34 UTC (rev 87655)
@@ -1,3 +1,28 @@
+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 Andreas Kling <[email protected]>
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (87654 => 87655)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2011-05-29 22:14:49 UTC (rev 87654)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2011-05-30 00:00:34 UTC (rev 87655)
@@ -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;
}
@@ -333,6 +334,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->setMuted(!mediaElement()->muted());
+ event->preventDefault();
event->stopPropagation();
}
@@ -419,6 +421,7 @@
if (event->type() == eventNames().clickEvent) {
mediaElement()->togglePlayState();
updateDisplayType();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -454,6 +457,7 @@
}
mediaElement()->pause(event->fromUserGesture());
m_seekTimer.startRepeating(cSeekRepeatDelay);
+ event->preventDefault();
event->stopPropagation();
} else if (event->type() == eventNames().mouseupEvent) {
if (m_capturing)
@@ -469,6 +473,7 @@
}
m_seekTimer.stop();
m_seeking = false;
+ event->preventDefault();
event->stopPropagation();
}
}
@@ -550,6 +555,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->rewind(30);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -580,6 +586,7 @@
{
if (event->type() == eventNames().clickEvent) {
mediaElement()->returnToRealtime();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -612,6 +619,7 @@
mediaElement()->setClosedCaptionsVisible(!mediaElement()->closedCaptionsVisible());
setChecked(mediaElement()->closedCaptionsVisible());
updateDisplayType();
+ event->preventDefault();
event->stopPropagation();
}
@@ -810,6 +818,7 @@
} else
#endif
mediaElement()->enterFullscreen();
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -840,6 +849,7 @@
if (event->type() == eventNames().clickEvent) {
ExceptionCode code = 0;
mediaElement()->setVolume(0, code);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
@@ -870,6 +880,7 @@
if (event->type() == eventNames().clickEvent) {
ExceptionCode code = 0;
mediaElement()->setVolume(1, code);
+ event->preventDefault();
event->stopPropagation();
}
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
