<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169387] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169387">169387</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 10:33:04 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] media controls should prevent 'click' events from reaching the page
https://bugs.webkit.org/show_bug.cgi?id=133268
Source/WebCore:
Reviewed by Jer Noble.
Test: media/media-controls-cancel-events.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handleEvent): Allow event handler to cancel event default action.
(Controller.prototype.handleRewindButtonClicked): Cancel event default.
(Controller.prototype.handlePlayButtonClicked): Ditto.
(Controller.prototype.handleMuteButtonClicked): Ditto.
(Controller.prototype.handleMinButtonClicked): Ditto.
(Controller.prototype.handleCaptionButtonClicked): Ditto.
(Controller.prototype.handleFullscreenButtonClicked): Ditto.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.handlePlayButtonTouchEnd): Ditto.
(ControllerIOS.prototype.handlePlayButtonTouchCancel): Ditto.
(ControllerIOS.prototype.handleFullscreenTouchEnd): Ditto.
(ControllerIOS.prototype.handleFullscreenTouchCancel): Ditto.
(ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd): Ditto.
(ControllerIOS.prototype.handleStartPlaybackButtonTouchCancel): Ditto.
(ControllerIOS.prototype.handleWirelessPickerButtonClicked): Ditto.
LayoutTests:
Reviewed by by Jer Noble.
* media/media-controls-cancel-events-expected.txt: Added.
* media/media-controls-cancel-events.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamediacontrolscanceleventsexpectedtxt">trunk/LayoutTests/media/media-controls-cancel-events-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamediacontrolscanceleventshtml">trunk/LayoutTests/media/media-controls-cancel-events.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169386 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-27 16:45:09 UTC (rev 169386)
+++ trunk/LayoutTests/ChangeLog 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-27 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] media controls should prevent 'click' events from reaching the page
+ https://bugs.webkit.org/show_bug.cgi?id=133268
+
+ Reviewed by by Jer Noble.
+
+ * media/media-controls-cancel-events-expected.txt: Added.
+ * media/media-controls-cancel-events.html: Added.
+
</ins><span class="cx"> 2014-05-27 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update ENABLE(MEDIA_SOURCE) on Mac
</span></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrolscanceleventsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-controls-cancel-events-expected.txt (0 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controls-cancel-events-expected.txt (rev 0)
+++ trunk/LayoutTests/media/media-controls-cancel-events-expected.txt 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+Test that 'click' events in the media controls don't propogate to the page.
+
+This test only runs in DRT!
+
+
+EVENT(canplaythrough)
+
+clicking in the play button
+
+EVENT(playing)
+
+clicking in mute button
+
+EVENT(volumechange)
+
+clicking in closed caption button
+
+100ms timer fired
+
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamediacontrolscanceleventshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/media-controls-cancel-events.html (0 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/media-controls-cancel-events.html (rev 0)
+++ trunk/LayoutTests/media/media-controls-cancel-events.html 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src=media-file.js></script>
+ <script src=media-controls.js></script>
+ <script src=video-test.js></script>
+ <script>
+ function bodyClick(event)
+ {
+ consoleWrite("");
+ failTest("'click' event handler on video parent triggered!");
+ }
+
+ function moveMouseToControlElement(elementName, click)
+ {
+ var controlLocation;
+ try {
+ controlLocation = mediaControlsButtonCoordinates(video, elementName);
+ } catch (exception) {
+ failTest(exception.description);
+ return;
+ }
+
+ eventSender.mouseMoveTo(controlLocation[0], controlLocation[1]);
+ if (click) {
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+ }
+
+ function canplaythrough()
+ {
+ consoleWrite("<br>clicking in the play button<br>");
+ moveMouseToControlElement("play-button", true);
+ }
+
+ function playing()
+ {
+ consoleWrite("<br>clicking in mute button<br>");
+ moveMouseToControlElement("mute-button", true);
+ }
+
+ function volumechange()
+ {
+ consoleWrite("<br>clicking in closed caption button<br>");
+ moveMouseToControlElement("toggle-closed-captions-button", true);
+ window.setTimeout(finish, 100);
+ }
+
+ function finish()
+ {
+ consoleWrite("100ms timer fired<br>");
+ endTest();
+ }
+
+ function start()
+ {
+ findMediaElement();
+
+ waitForEventOnce("canplaythrough", canplaythrough);
+ waitForEventOnce("playing", playing);
+ waitForEventOnce('volumechange', volumechange);
+
+ video.src = findMediaFile("video", "content/test");
+
+ if (!window.internals) {
+ failTest('This test requires window.internals.');
+ return;
+ }
+ }
+ </script>
+ </head>
+
+ <body onload="start()" onclick="bodyClick()">
+ <p>Test that 'click' events in the media controls don't propogate to the page.</p>
+ <p>This test only runs in DRT!</p>
+ <video controls>
+ <track src="track/captions-webvtt/captions-fast.vtt" kind="captions" srclang="en">
+ </video>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169386 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-27 16:45:09 UTC (rev 169386)
+++ trunk/Source/WebCore/ChangeLog 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-05-27 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] media controls should prevent 'click' events from reaching the page
+ https://bugs.webkit.org/show_bug.cgi?id=133268
+
+ Reviewed by Jer Noble.
+
+ Test: media/media-controls-cancel-events.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handleEvent): Allow event handler to cancel event default action.
+ (Controller.prototype.handleRewindButtonClicked): Cancel event default.
+ (Controller.prototype.handlePlayButtonClicked): Ditto.
+ (Controller.prototype.handleMuteButtonClicked): Ditto.
+ (Controller.prototype.handleMinButtonClicked): Ditto.
+ (Controller.prototype.handleCaptionButtonClicked): Ditto.
+ (Controller.prototype.handleFullscreenButtonClicked): Ditto.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.handlePlayButtonTouchEnd): Ditto.
+ (ControllerIOS.prototype.handlePlayButtonTouchCancel): Ditto.
+ (ControllerIOS.prototype.handleFullscreenTouchEnd): Ditto.
+ (ControllerIOS.prototype.handleFullscreenTouchCancel): Ditto.
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchEnd): Ditto.
+ (ControllerIOS.prototype.handleStartPlaybackButtonTouchCancel): Ditto.
+ (ControllerIOS.prototype.handleWirelessPickerButtonClicked): Ditto.
+
</ins><span class="cx"> 2014-05-27 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Mavericks bots from r169383.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (169386 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-05-27 16:45:09 UTC (rev 169386)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -202,6 +202,8 @@
</span><span class="cx">
</span><span class="cx"> handleEvent: function(event)
</span><span class="cx"> {
</span><ins>+ var preventDefault = false;
+
</ins><span class="cx"> try {
</span><span class="cx"> if (event.target === this.video) {
</span><span class="cx"> var handlerName = this.HandledVideoEvents[event.type];
</span><span class="lines">@@ -215,12 +217,17 @@
</span><span class="cx">
</span><span class="cx"> this.listeners[event.type].forEach(function(entry) {
</span><span class="cx"> if (entry.element === event.currentTarget && entry.handler instanceof Function)
</span><del>- entry.handler.call(this, event);
</del><ins>+ preventDefault |= entry.handler.call(this, event);
</ins><span class="cx"> }, this);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> if (window.console)
</span><span class="cx"> console.error(e);
</span><span class="cx"> }
</span><ins>+
+ if (preventDefault) {
+ event.stopPropagation();
+ event.preventDefault();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createBase: function()
</span><span class="lines">@@ -669,6 +676,7 @@
</span><span class="cx"> this.video.currentTime - this.RewindAmount,
</span><span class="cx"> this.video.seekable.start(0));
</span><span class="cx"> this.video.currentTime = newTime;
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> canPlay: function()
</span><span class="lines">@@ -682,6 +690,7 @@
</span><span class="cx"> this.video.play();
</span><span class="cx"> else
</span><span class="cx"> this.video.pause();
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleTimelineChange: function(event)
</span><span class="lines">@@ -757,6 +766,7 @@
</span><span class="cx"> this.video.muted = !this.video.muted;
</span><span class="cx"> if (this.video.muted)
</span><span class="cx"> this.controls.muteButton.setAttribute('aria-label', this.UIString('Unmute'));
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleMinButtonClicked: function(event)
</span><span class="lines">@@ -766,6 +776,7 @@
</span><span class="cx"> this.controls.muteButton.setAttribute('aria-label', this.UIString('Mute'));
</span><span class="cx"> }
</span><span class="cx"> this.video.volume = 0;
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleMaxButtonClicked: function(event)
</span><span class="lines">@@ -792,6 +803,7 @@
</span><span class="cx"> this.destroyCaptionMenu();
</span><span class="cx"> else
</span><span class="cx"> this.buildCaptionMenu();
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleFullscreenButtonClicked: function(event)
</span><span class="lines">@@ -800,6 +812,7 @@
</span><span class="cx"> document.webkitExitFullscreen();
</span><span class="cx"> else
</span><span class="cx"> this.video.webkitRequestFullscreen();
</span><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleControlsChange: function()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (169386 => 169387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-05-27 16:45:09 UTC (rev 169386)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-05-27 17:33:04 UTC (rev 169387)
</span><span class="lines">@@ -272,12 +272,12 @@
</span><span class="cx"> else
</span><span class="cx"> this.video.pause();
</span><span class="cx">
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handlePlayButtonTouchCancel: function(event) {
</span><span class="cx"> this.controls.playButton.classList.remove('active');
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleBaseGestureStart: function(event) {
</span><span class="lines">@@ -352,12 +352,12 @@
</span><span class="cx">
</span><span class="cx"> this.handleFullscreenButtonClicked();
</span><span class="cx">
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleFullscreenTouchCancel: function(event) {
</span><span class="cx"> this.controls.fullscreenButton.classList.remove('active');
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchStart: function(event) {
</span><span class="lines">@@ -367,15 +367,16 @@
</span><span class="cx"> handleStartPlaybackButtonTouchEnd: function(event) {
</span><span class="cx"> this.controls.fullscreenButton.classList.remove('active');
</span><span class="cx"> if (this.video.error)
</span><del>- return;
</del><ins>+ return true;
</ins><span class="cx">
</span><span class="cx"> this.video.play();
</span><del>- event.stopPropagation();
</del><ins>+
+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchCancel: function(event) {
</span><span class="cx"> this.controls.fullscreenButton.classList.remove('active');
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleReadyStateChange: function(event) {
</span><span class="lines">@@ -394,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> handleWirelessPickerButtonClicked: function(event) {
</span><span class="cx"> this.video.webkitShowPlaybackTargetPicker();
</span><del>- event.stopPropagation();
</del><ins>+ return true;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> get pageScaleFactor() {
</span></span></pre>
</div>
</div>
</body>
</html>