<!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>[191174] 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/191174">191174</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-16 03:47:31 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] ASSERTION FAILED: !m_adoptionIsRequired in MediaSourceGStreamer::addSourceBuffer
https://bugs.webkit.org/show_bug.cgi?id=150229
Reviewed by Philippe Normand.
This happens in the debug bot in all media source tests that run
that code. The problem is that we are creating a RefPtr without
adopting the reference.
* platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
(WebCore::MediaSourceGStreamer::addSourceBuffer): Use
SourceBufferPrivateGStreamer::create().
* platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp:
(WebCore::SourceBufferPrivateGStreamer::create): Added to make
sure you can't create a SourceBufferPrivateGStreamer without
adopting the reference.
(WebCore::SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer):
Takes a reference to the client instead of a PassRefPtr.
* platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerSourceBufferPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerSourceBufferPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191173 => 191174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-16 07:29:58 UTC (rev 191173)
+++ trunk/Source/WebCore/ChangeLog 2015-10-16 10:47:31 UTC (rev 191174)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-10-16 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GStreamer] ASSERTION FAILED: !m_adoptionIsRequired in MediaSourceGStreamer::addSourceBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=150229
+
+ Reviewed by Philippe Normand.
+
+ This happens in the debug bot in all media source tests that run
+ that code. The problem is that we are creating a RefPtr without
+ adopting the reference.
+
+ * platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
+ (WebCore::MediaSourceGStreamer::addSourceBuffer): Use
+ SourceBufferPrivateGStreamer::create().
+ * platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp:
+ (WebCore::SourceBufferPrivateGStreamer::create): Added to make
+ sure you can't create a SourceBufferPrivateGStreamer without
+ adopting the reference.
+ (WebCore::SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer):
+ Takes a reference to the client instead of a PassRefPtr.
+ * platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h:
+
</ins><span class="cx"> 2015-10-15 Roopesh Chander <roop@roopc.net>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Content blocking rules are not consulted for pings
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp (191173 => 191174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2015-10-16 07:29:58 UTC (rev 191173)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2015-10-16 10:47:31 UTC (rev 191174)
</span><span class="lines">@@ -63,9 +63,8 @@
</span><span class="cx">
</span><span class="cx"> MediaSourceGStreamer::AddStatus MediaSourceGStreamer::addSourceBuffer(const ContentType& contentType, RefPtr<SourceBufferPrivate>& sourceBufferPrivate)
</span><span class="cx"> {
</span><del>- RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivateGStreamer = new SourceBufferPrivateGStreamer(m_client.get(), contentType);
-
- sourceBufferPrivate = adoptRef(sourceBufferPrivateGStreamer.get());
</del><ins>+ RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivateGStreamer = SourceBufferPrivateGStreamer::create(*m_client, contentType);
+ sourceBufferPrivate = sourceBufferPrivateGStreamer;
</ins><span class="cx"> return m_client->addSourceBuffer(sourceBufferPrivateGStreamer, contentType);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerSourceBufferPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp (191173 => 191174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp 2015-10-16 07:29:58 UTC (rev 191173)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.cpp 2015-10-16 10:47:31 UTC (rev 191174)
</span><span class="lines">@@ -40,9 +40,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer(PassRefPtr<MediaSourceClientGStreamer> client, const ContentType& contentType)
</del><ins>+Ref<SourceBufferPrivateGStreamer> SourceBufferPrivateGStreamer::create(MediaSourceClientGStreamer& client, const ContentType& contentType)
+{
+ return adoptRef(*new SourceBufferPrivateGStreamer(client, contentType));
+}
+
+SourceBufferPrivateGStreamer::SourceBufferPrivateGStreamer(MediaSourceClientGStreamer& client, const ContentType& contentType)
</ins><span class="cx"> : m_type(contentType)
</span><del>- , m_client(client)
</del><ins>+ , m_client(&client)
</ins><span class="cx"> , m_readyState(MediaPlayer::HaveNothing)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerSourceBufferPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h (191173 => 191174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h 2015-10-16 07:29:58 UTC (rev 191173)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/SourceBufferPrivateGStreamer.h 2015-10-16 10:47:31 UTC (rev 191174)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> class SourceBufferPrivateGStreamer final : public SourceBufferPrivate {
</span><span class="cx"> public:
</span><del>- SourceBufferPrivateGStreamer(PassRefPtr<MediaSourceClientGStreamer>, const ContentType&);
</del><ins>+ static Ref<SourceBufferPrivateGStreamer> create(MediaSourceClientGStreamer&, const ContentType&);
</ins><span class="cx"> virtual ~SourceBufferPrivateGStreamer();
</span><span class="cx">
</span><span class="cx"> virtual void setClient(SourceBufferPrivateClient*);
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx"> virtual void notifyClientWhenReadyForMoreSamples(AtomicString);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ SourceBufferPrivateGStreamer(MediaSourceClientGStreamer&, const ContentType&);
+
</ins><span class="cx"> ContentType m_type;
</span><span class="cx"> RefPtr<MediaSourceClientGStreamer> m_client;
</span><span class="cx"> SourceBufferPrivateClient* m_sourceBufferPrivateClient;
</span></span></pre>
</div>
</div>
</body>
</html>