<!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>[214426] 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/214426">214426</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-27 12:44:09 -0700 (Mon, 27 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Clicking on the tracks button when the tracks panel is up in a media document pauses the video
https://bugs.webkit.org/show_bug.cgi?id=168517
<rdar://problem/30577636>
Reviewed by Dean Jackson.
Source/WebCore:
We completely turn off default event handling in MediaDocument.cpp since we're implementing the
behavior we expect to pause and resume the video in the modern-media-controls module already. This
gets rid of this odd case where the content would not see the "click" event while the C++ side would
handle it and pause the video.
* Modules/modern-media-controls/media/media-controller.js:
(MediaController):
(MediaController.prototype.handleEvent):
(MediaController.prototype._containerWasClicked): Deleted.
* html/MediaDocument.cpp:
(WebCore::MediaDocument::defaultEventHandler):
LayoutTests:
* media/video-click-dblckick-standalone.html: We disable modern-media-controls here since we know that this test won't pass with them on.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideoclickdblckickstandalonehtml">trunk/LayoutTests/media/video-click-dblckick-standalone.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs">trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaDocumentcpp">trunk/Source/WebCore/html/MediaDocument.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214425 => 214426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-27 19:40:01 UTC (rev 214425)
+++ trunk/LayoutTests/ChangeLog 2017-03-27 19:44:09 UTC (rev 214426)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Clicking on the tracks button when the tracks panel is up in a media document pauses the video
+ https://bugs.webkit.org/show_bug.cgi?id=168517
+ <rdar://problem/30577636>
+
+ Reviewed by Dean Jackson.
+
+ * media/video-click-dblckick-standalone.html: We disable modern-media-controls here since we know that this test won't pass with them on.
+
</ins><span class="cx"> 2017-03-27 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/modern-media-controls/time-label/time-label-white-space-nowrap.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideoclickdblckickstandalonehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-click-dblckick-standalone.html (214425 => 214426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-click-dblckick-standalone.html 2017-03-27 19:40:01 UTC (rev 214425)
+++ trunk/LayoutTests/media/video-click-dblckick-standalone.html 2017-03-27 19:44:09 UTC (rev 214426)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+<!DOCTYPE html><!-- webkit-test-runner [ enableModernMediaControls=false ] -->
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src=media-file.js></script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214425 => 214426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-27 19:40:01 UTC (rev 214425)
+++ trunk/Source/WebCore/ChangeLog 2017-03-27 19:44:09 UTC (rev 214426)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-03-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Clicking on the tracks button when the tracks panel is up in a media document pauses the video
+ https://bugs.webkit.org/show_bug.cgi?id=168517
+ <rdar://problem/30577636>
+
+ Reviewed by Dean Jackson.
+
+ We completely turn off default event handling in MediaDocument.cpp since we're implementing the
+ behavior we expect to pause and resume the video in the modern-media-controls module already. This
+ gets rid of this odd case where the content would not see the "click" event while the C++ side would
+ handle it and pause the video.
+
+ * Modules/modern-media-controls/media/media-controller.js:
+ (MediaController):
+ (MediaController.prototype.handleEvent):
+ (MediaController.prototype._containerWasClicked): Deleted.
+ * html/MediaDocument.cpp:
+ (WebCore::MediaDocument::defaultEventHandler):
+
</ins><span class="cx"> 2017-03-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Tighten RTCDatachannel creation and parameter getters
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsmediamediacontrollerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js (214425 => 214426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-03-27 19:40:01 UTC (rev 214425)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js 2017-03-27 19:44:09 UTC (rev 214426)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> this.container = shadowRoot.appendChild(document.createElement("div"));
</span><span class="cx"> this.container.className = "media-controls-container";
</span><del>- this.container.addEventListener("click", this, true);
</del><span class="cx">
</span><span class="cx"> if (host) {
</span><span class="cx"> host.controlsDependOnPageScaleFactor = this.layoutTraits & LayoutTraits.iOS;
</span><span class="lines">@@ -133,9 +132,7 @@
</span><span class="cx"> this._updateControlsIfNeeded();
</span><span class="cx"> // We must immediately perform layouts so that we don't lag behind the media layout size.
</span><span class="cx"> scheduler.flushScheduledLayoutCallbacks();
</span><del>- } else if (event.type === "click" && event.currentTarget === this.container)
- this._containerWasClicked(event);
- else if (event.currentTarget === this.media) {
</del><ins>+ } else if (event.currentTarget === this.media) {
</ins><span class="cx"> this._updateControlsIfNeeded();
</span><span class="cx"> if (event.type === "webkitpresentationmodechanged")
</span><span class="cx"> this._returnMediaLayerToInlineIfNeeded();
</span><span class="lines">@@ -144,13 +141,6 @@
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _containerWasClicked(event)
- {
- // We need to call preventDefault() here since, in the case of Media Documents,
- // playback may be toggled when clicking on the video.
- event.preventDefault();
- }
-
</del><span class="cx"> _updateControlsIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> const layoutTraits = this.layoutTraits;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.cpp (214425 => 214426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.cpp 2017-03-27 19:40:01 UTC (rev 214425)
+++ trunk/Source/WebCore/html/MediaDocument.cpp 2017-03-27 19:44:09 UTC (rev 214426)
</span><span class="lines">@@ -181,7 +181,12 @@
</span><span class="cx">
</span><span class="cx"> void MediaDocument::defaultEventHandler(Event& event)
</span><span class="cx"> {
</span><del>- // Match the default Quicktime plugin behavior to allow
</del><ins>+ // Modern media controls have their own event handling to determine when to
+ // pause or resume playback.
+ if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
+ return;
+
+ // Match the default Quicktime plugin behavior to allow
</ins><span class="cx"> // clicking and double-clicking to pause and play the media.
</span><span class="cx"> Node* targetNode = event.target()->toNode();
</span><span class="cx"> if (!targetNode)
</span></span></pre>
</div>
</div>
</body>
</html>