<!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>[206209] 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/206209">206209</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-09-21 09:13:57 -0700 (Wed, 21 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html
https://bugs.webkit.org/show_bug.cgi?id=162257
Reviewed by Eric Carlson.
Source/WebCore:
Some of the conditions in the track changed methods were reversed, and all failed to schedule
a change event.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::videoTrackSelectedChanged):
(WebCore::SourceBuffer::audioTrackEnabledChanged):
(WebCore::SourceBuffer::textTrackModeChanged):
LayoutTests:
* platform/mac/TestExpectations:</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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206208 => 206209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-21 16:12:33 UTC (rev 206208)
+++ trunk/LayoutTests/ChangeLog 2016-09-21 16:13:57 UTC (rev 206209)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-09-19 Jer Noble <jer.noble@apple.com>
+
+ [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html
+ https://bugs.webkit.org/show_bug.cgi?id=162257
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-09-20 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [media-source] Fix imported/w3c/web-platform-tests/media-source/URL-createObjectURL-null.html
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (206208 => 206209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-21 16:12:33 UTC (rev 206208)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-21 16:13:57 UTC (rev 206209)
</span><span class="lines">@@ -1044,6 +1044,7 @@
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/SourceBuffer-abort.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/URL-createObjectURL.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/URL-createObjectURL-null.html [ Pass ]
</span><ins>+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html [ Pass ]
</ins><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer-mode.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-appendwindow.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206208 => 206209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-21 16:12:33 UTC (rev 206208)
+++ trunk/Source/WebCore/ChangeLog 2016-09-21 16:13:57 UTC (rev 206209)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-19 Jer Noble <jer.noble@apple.com>
+
+ [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-activesourcebuffers.html
+ https://bugs.webkit.org/show_bug.cgi?id=162257
+
+ Reviewed by Eric Carlson.
+
+ Some of the conditions in the track changed methods were reversed, and all failed to schedule
+ a change event.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::videoTrackSelectedChanged):
+ (WebCore::SourceBuffer::audioTrackEnabledChanged):
+ (WebCore::SourceBuffer::textTrackModeChanged):
+
</ins><span class="cx"> 2016-09-20 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [media-source] Fix imported/w3c/web-platform-tests/media-source/URL-createObjectURL-null.html
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (206208 => 206209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-09-21 16:12:33 UTC (rev 206208)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-09-21 16:13:57 UTC (rev 206209)
</span><span class="lines">@@ -1695,7 +1695,7 @@
</span><span class="cx"> // If the selected video track changes, then run the following steps:
</span><span class="cx"> // 1. If the SourceBuffer associated with the previously selected video track is not associated with
</span><span class="cx"> // any other enabled tracks, run the following steps:
</span><del>- if (track->selected()
</del><ins>+ if (!track->selected()
</ins><span class="cx"> && (!m_videoTracks || !m_videoTracks->isAnyTrackEnabled())
</span><span class="cx"> && (!m_audioTracks || !m_audioTracks->isAnyTrackEnabled())
</span><span class="cx"> && (!m_textTracks || !m_textTracks->isAnyTrackEnabled())) {
</span><span class="lines">@@ -1702,7 +1702,7 @@
</span><span class="cx"> // 1.1 Remove the SourceBuffer from activeSourceBuffers.
</span><span class="cx"> // 1.2 Queue a task to fire a simple event named removesourcebuffer at activeSourceBuffers
</span><span class="cx"> setActive(false);
</span><del>- } else if (!track->selected()) {
</del><ins>+ } else if (track->selected()) {
</ins><span class="cx"> // 2. If the SourceBuffer associated with the newly selected video track is not already in activeSourceBuffers,
</span><span class="cx"> // run the following steps:
</span><span class="cx"> // 2.1 Add the SourceBuffer to activeSourceBuffers.
</span><span class="lines">@@ -1710,6 +1710,9 @@
</span><span class="cx"> setActive(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_videoTracks && m_videoTracks->contains(*track))
+ m_videoTracks->scheduleChangeEvent();
+
</ins><span class="cx"> if (!isRemoved())
</span><span class="cx"> m_source->mediaElement()->videoTrackSelectedChanged(track);
</span><span class="cx"> }
</span><span class="lines">@@ -1719,7 +1722,7 @@
</span><span class="cx"> // 2.4.5 Changes to selected/enabled track state
</span><span class="cx"> // If an audio track becomes disabled and the SourceBuffer associated with this track is not
</span><span class="cx"> // associated with any other enabled or selected track, then run the following steps:
</span><del>- if (track->enabled()
</del><ins>+ if (!track->enabled()
</ins><span class="cx"> && (!m_videoTracks || !m_videoTracks->isAnyTrackEnabled())
</span><span class="cx"> && (!m_audioTracks || !m_audioTracks->isAnyTrackEnabled())
</span><span class="cx"> && (!m_textTracks || !m_textTracks->isAnyTrackEnabled())) {
</span><span class="lines">@@ -1726,7 +1729,7 @@
</span><span class="cx"> // 1. Remove the SourceBuffer associated with the audio track from activeSourceBuffers
</span><span class="cx"> // 2. Queue a task to fire a simple event named removesourcebuffer at activeSourceBuffers
</span><span class="cx"> setActive(false);
</span><del>- } else if (!track->enabled()) {
</del><ins>+ } else if (track->enabled()) {
</ins><span class="cx"> // If an audio track becomes enabled and the SourceBuffer associated with this track is
</span><span class="cx"> // not already in activeSourceBuffers, then run the following steps:
</span><span class="cx"> // 1. Add the SourceBuffer associated with the audio track to activeSourceBuffers
</span><span class="lines">@@ -1734,6 +1737,9 @@
</span><span class="cx"> setActive(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_audioTracks && m_audioTracks->contains(*track))
+ m_audioTracks->scheduleChangeEvent();
+
</ins><span class="cx"> if (!isRemoved())
</span><span class="cx"> m_source->mediaElement()->audioTrackEnabledChanged(track);
</span><span class="cx"> }
</span><span class="lines">@@ -1758,6 +1764,9 @@
</span><span class="cx"> setActive(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (m_textTracks && m_textTracks->contains(*track))
+ m_textTracks->scheduleChangeEvent();
+
</ins><span class="cx"> if (!isRemoved())
</span><span class="cx"> m_source->mediaElement()->textTrackModeChanged(track);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>