<!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>[187653] trunk/LayoutTests</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/187653">187653</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 09:59:51 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: add test to ensure next/previous-track event handlers are not fired when they are disabled
https://bugs.webkit.org/show_bug.cgi?id=147477
Reviewed by Eric Carlson.
* media/session/track-media-events-disabled-expected.txt: Added.
* media/session/track-media-events-disabled.html: Added.
* platform/mac/TestExpectations: Media Session support is disabled by default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediasessiontrackmediaeventsdisabledexpectedtxt">trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediasessiontrackmediaeventsdisabledhtml">trunk/LayoutTests/media/session/track-media-events-disabled.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187652 => 187653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-31 16:51:57 UTC (rev 187652)
+++ trunk/LayoutTests/ChangeLog 2015-07-31 16:59:51 UTC (rev 187653)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-07-30 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><ins>+ Media Session: add test to ensure next/previous-track event handlers are not fired when they are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=147477
+
+ Reviewed by Eric Carlson.
+
+ * media/session/track-media-events-disabled-expected.txt: Added.
+ * media/session/track-media-events-disabled.html: Added.
+ * platform/mac/TestExpectations: Media Session support is disabled by default.
+
+2015-07-30 Matt Rajca <mrajca@apple.com>
+
</ins><span class="cx"> Media Session: add test to ensure media sessions are in an Idle state after creation
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147471
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediasessiontrackmediaeventsdisabledexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt (0 => 187653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/media/session/track-media-events-disabled-expected.txt 2015-07-31 16:59:51 UTC (rev 187653)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Previous/Next Track events should not be fired if previous/nextTrackEnabled are 'false'.
+
+
+EVENT(canplaythrough)
+EXPECTED (video.paused == 'true') OK
+Begin playing media.
+EVENT(playing)
+Media began playing.
+EXPECTED (video.paused == 'false') OK
+EXPECTED (internals.mediaSessionCurrentState(session) == 'active') OK
+Sending Next Track media event.
+RUN(internals.sendMediaControlEvent("next-track"))
+Sending Previous Track media event.
+RUN(internals.sendMediaControlEvent("previous-track"))
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediasessiontrackmediaeventsdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/session/track-media-events-disabled.html (0 => 187653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/session/track-media-events-disabled.html (rev 0)
+++ trunk/LayoutTests/media/session/track-media-events-disabled.html 2015-07-31 16:59:51 UTC (rev 187653)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src="../video-test.js"></script>
+ <script src="../media-file.js"></script>
+ <script type="text/javascript">
+ var session, controls;
+
+ function runTest()
+ {
+ session = new MediaSession("content");
+ controls = session.controls;
+ controls.nextTrackEnabled = false;
+ controls.previousTrackEnabled = false;
+ waitForEvent('nexttrack', skipToNextTrack, false, true, controls);
+ waitForEvent('previoustrack', skipToPreviousTrack, false, true, controls);
+
+ findMediaElement();
+ waitForEvent('canplaythrough', beginPlaying);
+ video.src = findMediaFile("video", "../content/counting");
+ video.session = session;
+ waitForEvent('playing', beganPlaying, false, true, video);
+ }
+
+ function beginPlaying(event)
+ {
+ testExpected('video.paused', true);
+
+ consoleWrite("Begin playing media.");
+ video.play();
+ }
+
+ function beganPlaying(event)
+ {
+ consoleWrite("Media began playing.");
+ testExpected('video.paused', false);
+
+ if (window.internals) {
+ testExpected('internals.mediaSessionCurrentState(session)', "active");
+
+ consoleWrite("Sending Next Track media event.");
+ run('internals.sendMediaControlEvent("next-track")');
+
+ consoleWrite("Sending Previous Track media event.");
+ run('internals.sendMediaControlEvent("previous-track")');
+
+ window.setTimeout("endTest()", 200);
+ } else {
+ endTest();
+ }
+ }
+
+ function skipToNextTrack(event)
+ {
+ failTest("next-track events should not be fired.");
+ }
+
+ function skipToPreviousTrack(event)
+ {
+ failTest("previous-track events should not be fired.");
+ }
+ </script>
+</head>
+<body onload="runTest()">
+ <p>Previous/Next Track events should not be fired if previous/nextTrackEnabled are 'false'.</p>
+ <video id="video" />
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (187652 => 187653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2015-07-31 16:51:57 UTC (rev 187652)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-07-31 16:59:51 UTC (rev 187653)
</span><span class="lines">@@ -1000,6 +1000,7 @@
</span><span class="cx"> media/session/play-pause-media-events-in-content-sessions.html
</span><span class="cx"> media/session/play-pause-media-events-in-non-content-sessions.html
</span><span class="cx"> media/session/session-creation.html
</span><ins>+media/session/track-media-events-disabled.html
</ins><span class="cx"> media/session/track-media-events-in-content-sessions.html
</span><span class="cx"> media/session/transient-interruptions.html
</span><span class="cx"> media/session/transient-solo-interruptions.html
</span></span></pre>
</div>
</div>
</body>
</html>