<!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>[171151] trunk/Source/WebCore</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/171151">171151</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-07-16 13:51:19 -0700 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MSE] http/tests/media/media-source/mediasource-buffered.html is flakey
https://bugs.webkit.org/show_bug.cgi?id=134949
Reviewed by Eric Carlson.
Depending on which SourceBuffer is successfully parsed first, the order of activeSourceBuffers
may change from run to run, breaking the http/tests/media/media-source/mediasource-buffered.html
test. Make the order of activeSourceBuffers the same as (a subset of) sourceBuffers, by replacing
calls to activeSourceBuffers->add() and with a new call to regenerateActiveSourceBuffers(), which
swaps the contents of the SourceBufferList with a new, ordered Vector.
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::addSourceBuffer):
(WebCore::MediaSource::sourceBufferDidChangeAcitveState):
(WebCore::MediaSource::regenerateActiveSourceBuffers):
* Modules/mediasource/MediaSource.h:
* Modules/mediasource/SourceBufferList.cpp:
(WebCore::SourceBufferList::swap):
* Modules/mediasource/SourceBufferList.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourcecpp">trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceMediaSourceh">trunk/Source/WebCore/Modules/mediasource/MediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBufferListcpp">trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBufferListh">trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171150 => 171151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-16 20:31:06 UTC (rev 171150)
+++ trunk/Source/WebCore/ChangeLog 2014-07-16 20:51:19 UTC (rev 171151)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-16 Jer Noble <jer.noble@apple.com>
+
+ [MSE] http/tests/media/media-source/mediasource-buffered.html is flakey
+ https://bugs.webkit.org/show_bug.cgi?id=134949
+
+ Reviewed by Eric Carlson.
+
+ Depending on which SourceBuffer is successfully parsed first, the order of activeSourceBuffers
+ may change from run to run, breaking the http/tests/media/media-source/mediasource-buffered.html
+ test. Make the order of activeSourceBuffers the same as (a subset of) sourceBuffers, by replacing
+ calls to activeSourceBuffers->add() and with a new call to regenerateActiveSourceBuffers(), which
+ swaps the contents of the SourceBufferList with a new, ordered Vector.
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::addSourceBuffer):
+ (WebCore::MediaSource::sourceBufferDidChangeAcitveState):
+ (WebCore::MediaSource::regenerateActiveSourceBuffers):
+ * Modules/mediasource/MediaSource.h:
+ * Modules/mediasource/SourceBufferList.cpp:
+ (WebCore::SourceBufferList::swap):
+ * Modules/mediasource/SourceBufferList.h:
+
</ins><span class="cx"> 2014-07-16 Mike West <mkwst@chromium.org>
</span><span class="cx">
</span><span class="cx"> CSP: Drop 'script-nonce' directive.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (171150 => 171151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-07-16 20:31:06 UTC (rev 171150)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-07-16 20:51:19 UTC (rev 171151)
</span><span class="lines">@@ -540,9 +540,8 @@
</span><span class="cx"> RefPtr<SourceBuffer> buffer = SourceBuffer::create(sourceBufferPrivate.releaseNonNull(), this);
</span><span class="cx"> // 6. Add the new object to sourceBuffers and fire a addsourcebuffer on that object.
</span><span class="cx"> m_sourceBuffers->add(buffer);
</span><ins>+ regenerateActiveSourceBuffers();
</ins><span class="cx">
</span><del>- if (buffer->active())
- m_activeSourceBuffers->add(buffer);
</del><span class="cx"> // 7. Return the new object to the caller.
</span><span class="cx"> return buffer.get();
</span><span class="cx"> }
</span><span class="lines">@@ -745,12 +744,9 @@
</span><span class="cx"> setReadyState(closedKeyword());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaSource::sourceBufferDidChangeAcitveState(SourceBuffer* sourceBuffer, bool active)
</del><ins>+void MediaSource::sourceBufferDidChangeAcitveState(SourceBuffer*, bool)
</ins><span class="cx"> {
</span><del>- if (active && !m_activeSourceBuffers->contains(sourceBuffer))
- m_activeSourceBuffers->add(sourceBuffer);
- else if (!active && m_activeSourceBuffers->contains(sourceBuffer))
- m_activeSourceBuffers->remove(sourceBuffer);
</del><ins>+ regenerateActiveSourceBuffers();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MediaSource::attachToElement(HTMLMediaElement* element)
</span><span class="lines">@@ -869,6 +865,16 @@
</span><span class="cx"> return MediaSourceRegistry::registry();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaSource::regenerateActiveSourceBuffers()
+{
+ Vector<RefPtr<SourceBuffer>> newList;
+ for (auto& sourceBuffer : *m_sourceBuffers) {
+ if (sourceBuffer->active())
+ newList.append(sourceBuffer);
+ }
+ m_activeSourceBuffers->swap(newList);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (171150 => 171151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-07-16 20:31:06 UTC (rev 171150)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2014-07-16 20:51:19 UTC (rev 171151)
</span><span class="lines">@@ -123,6 +123,8 @@
</span><span class="cx"> void scheduleEvent(const AtomicString& eventName);
</span><span class="cx"> GenericEventQueue& asyncEventQueue() { return m_asyncEventQueue; }
</span><span class="cx">
</span><ins>+ void regenerateActiveSourceBuffers();
+
</ins><span class="cx"> static URLRegistry* s_registry;
</span><span class="cx">
</span><span class="cx"> RefPtr<MediaSourcePrivate> m_private;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBufferListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp (171150 => 171151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2014-07-16 20:31:06 UTC (rev 171150)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2014-07-16 20:51:19 UTC (rev 171151)
</span><span class="lines">@@ -70,6 +70,24 @@
</span><span class="cx"> scheduleEvent(eventNames().removesourcebufferEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SourceBufferList::swap(Vector<RefPtr<SourceBuffer>>& other)
+{
+ int changeInSize = other.size() - m_list.size();
+ int addedEntries = 0;
+ for (auto& sourceBuffer : other) {
+ if (!m_list.contains(sourceBuffer))
+ ++addedEntries;
+ }
+ int removedEntries = addedEntries - changeInSize;
+
+ m_list.swap(other);
+
+ if (addedEntries)
+ scheduleEvent(eventNames().addsourcebufferEvent);
+ if (removedEntries)
+ scheduleEvent(eventNames().removesourcebufferEvent);
+}
+
</ins><span class="cx"> void SourceBufferList::scheduleEvent(const AtomicString& eventName)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Event> event = Event::create(eventName, false, false);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBufferListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h (171150 => 171151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2014-07-16 20:31:06 UTC (rev 171150)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2014-07-16 20:51:19 UTC (rev 171151)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> void remove(SourceBuffer*);
</span><span class="cx"> bool contains(SourceBuffer* buffer) { return m_list.find(buffer) != notFound; }
</span><span class="cx"> void clear();
</span><ins>+ void swap(Vector<RefPtr<SourceBuffer>>&);
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<SourceBuffer>>::iterator begin() { return m_list.begin(); }
</span><span class="cx"> Vector<RefPtr<SourceBuffer>>::iterator end() { return m_list.end(); }
</span></span></pre>
</div>
</div>
</body>
</html>