<!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>[169210] branches/safari-538.34-branch/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/169210">169210</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 12:06:49 -0700 (Thu, 22 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169209">r169209</a>. &lt;rdar://problem/16933311&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebCoreChangeLog">branches/safari-538.34-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreModulesmediasourceSampleMapcpp">branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreModulesmediasourceSampleMaph">branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreModulesmediasourceSourceBuffercpp">branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreModulesmediasourceSourceBufferh">branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreplatformMediaSampleh">branches/safari-538.34-branch/Source/WebCore/platform/MediaSample.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreplatformmockmediasourceMockSourceBufferPrivatecpp">branches/safari-538.34-branch/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/ChangeLog        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2014-05-22  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r169209
+
+    2014-05-22  Jer Noble  &lt;jer.noble@apple.com&gt;
+    
+            [MSE] Stored samples are not freed when SourceBuffer is removed from MediaSource
+            https://bugs.webkit.org/show_bug.cgi?id=133174
+    
+            Reviewed by Eric Carlson.
+    
+            Clear out stored MediaSamples from SourceBuffer's TrackBuffer storage when
+            aborting loading. Also, report the memory cost of those samples, so that the
+            SourceBuffer will be GCd more readily.
+    
+            Add a mechanism for reporting the size of a MediaSample:
+            * Modules/mediasource/SourceBuffer.h:
+            * platform/MediaSample.h:
+            * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+            * platform/mock/mediasource/MockSourceBufferPrivate.cpp:
+    
+            Track the memory usage of a SampleMap when adding and removing samples, as well
+            as allowing the SampleMap to be cleared wholesale:
+            * Modules/mediasource/SampleMap.cpp:
+            (WebCore::SampleMap::clear): Release all stored MediaSamples.
+            (WebCore::SampleMap::addSample): Update m_totalSize.
+            (WebCore::SampleMap::removeSample): Ditto.
+            * Modules/mediasource/SampleMap.h:
+            (WebCore::SampleMap::SampleMap): Initialize m_totalSize.
+            (WebCore::SampleMap::sizeInBytes): Simple accessor.
+    
+            Clear the stored samples when loading is aborted, and report the extra memory
+            cost
+            * Modules/mediasource/SourceBuffer.cpp:
+            (WebCore::SourceBuffer::SourceBuffer): Initialize m_reportedExtraMemoryCost.
+            (WebCore::SourceBuffer::removedFromMediaSource): Clear all stored samples.
+            (WebCore::SourceBuffer::sourceBufferPrivateAppendComplete): Call reportExtraMemoryCost().
+            (WebCore::SourceBuffer::reportExtraMemoryCost): Inform the vm of the new
+                extra memory cost incurred by the object.
+    
</ins><span class="cx"> 2014-05-20  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rollout r169076.
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreModulesmediasourceSampleMapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.cpp        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -80,12 +80,21 @@
</span><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+void SampleMap::clear()
+{
+    m_presentationSamples.clear();
+    m_decodeSamples.clear();
+    m_totalSize = 0;
+}
+
</ins><span class="cx"> void SampleMap::addSample(PassRefPtr&lt;MediaSample&gt; prpSample)
</span><span class="cx"> {
</span><span class="cx">     RefPtr&lt;MediaSample&gt; sample = prpSample;
</span><span class="cx">     ASSERT(sample);
</span><span class="cx">     m_presentationSamples.insert(MapType::value_type(sample-&gt;presentationTime(), sample));
</span><span class="cx">     m_decodeSamples.insert(MapType::value_type(sample-&gt;decodeTime(), sample));
</span><ins>+
+    m_totalSize += sample-&gt;sizeInBytes();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SampleMap::removeSample(MediaSample* sample)
</span><span class="lines">@@ -93,6 +102,8 @@
</span><span class="cx">     ASSERT(sample);
</span><span class="cx">     m_presentationSamples.erase(sample-&gt;presentationTime());
</span><span class="cx">     m_decodeSamples.erase(sample-&gt;decodeTime());
</span><ins>+
+    m_totalSize -= sample-&gt;sizeInBytes();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> SampleMap::iterator SampleMap::findSampleContainingPresentationTime(const MediaTime&amp; time)
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreModulesmediasourceSampleMaph"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.h (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.h        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SampleMap.h        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -44,8 +44,15 @@
</span><span class="cx">     typedef std::pair&lt;iterator, iterator&gt; iterator_range;
</span><span class="cx">     typedef std::pair&lt;reverse_iterator, reverse_iterator&gt; reverse_iterator_range;
</span><span class="cx"> 
</span><ins>+    SampleMap()
+        : m_totalSize(0)
+    {
+    }
+
+    void clear();
</ins><span class="cx">     void addSample(PassRefPtr&lt;MediaSample&gt;);
</span><span class="cx">     void removeSample(MediaSample*);
</span><ins>+    size_t sizeInBytes() const { return m_totalSize; }
</ins><span class="cx"> 
</span><span class="cx">     iterator presentationBegin() { return m_presentationSamples.begin(); }
</span><span class="cx">     iterator presentationEnd() { return m_presentationSamples.end(); }
</span><span class="lines">@@ -73,6 +80,7 @@
</span><span class="cx"> private:
</span><span class="cx">     MapType m_presentationSamples;
</span><span class="cx">     MapType m_decodeSamples;
</span><ins>+    size_t m_totalSize;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> #include &quot;TimeRanges.h&quot;
</span><span class="cx"> #include &quot;VideoTrackList.h&quot;
</span><span class="cx"> #include &lt;map&gt;
</span><ins>+#include &lt;runtime/JSCInlines.h&gt;
+#include &lt;runtime/JSLock.h&gt;
+#include &lt;runtime/VM.h&gt;
</ins><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><span class="cx"> #include &lt;wtf/NeverDestroyed.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -103,6 +106,7 @@
</span><span class="cx">     , m_timeOfBufferingMonitor(monotonicallyIncreasingTime())
</span><span class="cx">     , m_bufferedSinceLastMonitor(0)
</span><span class="cx">     , m_averageBufferRate(0)
</span><ins>+    , m_reportedExtraMemoryCost(0)
</ins><span class="cx">     , m_pendingRemoveStart(MediaTime::invalidTime())
</span><span class="cx">     , m_pendingRemoveEnd(MediaTime::invalidTime())
</span><span class="cx">     , m_removeTimer(this, &amp;SourceBuffer::removeTimerFired)
</span><span class="lines">@@ -289,6 +293,11 @@
</span><span class="cx"> 
</span><span class="cx">     abortIfUpdating();
</span><span class="cx"> 
</span><ins>+    for (auto&amp; trackBufferPair : m_trackBufferMap.values()) {
+        trackBufferPair.samples.clear();
+        trackBufferPair.decodeQueue.clear();
+    }
+
</ins><span class="cx">     m_private-&gt;removedFromMediaSource();
</span><span class="cx">     m_source = 0;
</span><span class="cx">     m_asyncEventQueue.close();
</span><span class="lines">@@ -446,6 +455,8 @@
</span><span class="cx"> 
</span><span class="cx">     // 6. Asynchronously run the buffer append algorithm.
</span><span class="cx">     m_appendBufferTimer.startOneShot(0);
</span><ins>+
+    reportExtraMemoryCost();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SourceBuffer::appendBufferTimerFired(Timer&lt;SourceBuffer&gt;&amp;)
</span><span class="lines">@@ -516,6 +527,8 @@
</span><span class="cx">         m_source-&gt;monitorSourceBuffers();
</span><span class="cx">     for (auto iter = m_trackBufferMap.begin(), end = m_trackBufferMap.end(); iter != end; ++iter)
</span><span class="cx">         provideMediaData(iter-&gt;value, iter-&gt;key);
</span><ins>+
+    reportExtraMemoryCost();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SourceBuffer::removeCodedFrames(const MediaTime&amp; start, const MediaTime&amp; end)
</span><span class="lines">@@ -1424,6 +1437,23 @@
</span><span class="cx">     return unbufferedTime / m_averageBufferRate &lt; timeRemaining;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void SourceBuffer::reportExtraMemoryCost()
+{
+    size_t extraMemoryCost = m_pendingAppendData.capacity();
+    for (auto&amp; trackBuffer : m_trackBufferMap.values())
+        extraMemoryCost += trackBuffer.samples.sizeInBytes();
+
+    if (extraMemoryCost &lt; m_reportedExtraMemoryCost)
+        return;
+
+    size_t extraMemoryCostDelta = extraMemoryCost - m_reportedExtraMemoryCost;
+    m_reportedExtraMemoryCost = extraMemoryCost;
+
+    JSC::JSLockHolder lock(scriptExecutionContext()-&gt;vm());
+    if (extraMemoryCostDelta &gt; 0)
+        scriptExecutionContext()-&gt;vm().heap.reportExtraMemoryCost(extraMemoryCostDelta);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreModulesmediasourceSourceBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx">     void removeTimerFired(Timer&lt;SourceBuffer&gt;*);
</span><span class="cx">     void removeCodedFrames(const MediaTime&amp; start, const MediaTime&amp; end);
</span><span class="cx"> 
</span><ins>+    void reportExtraMemoryCost();
+
</ins><span class="cx">     Ref&lt;SourceBufferPrivate&gt; m_private;
</span><span class="cx">     MediaSource* m_source;
</span><span class="cx">     GenericEventQueue m_asyncEventQueue;
</span><span class="lines">@@ -188,6 +190,8 @@
</span><span class="cx">     double m_bufferedSinceLastMonitor;
</span><span class="cx">     double m_averageBufferRate;
</span><span class="cx"> 
</span><ins>+    size_t m_reportedExtraMemoryCost;
+
</ins><span class="cx">     MediaTime m_pendingRemoveStart;
</span><span class="cx">     MediaTime m_pendingRemoveEnd;
</span><span class="cx">     Timer&lt;SourceBuffer&gt; m_removeTimer;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreplatformMediaSampleh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/platform/MediaSample.h (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/platform/MediaSample.h        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/platform/MediaSample.h        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx">     virtual MediaTime decodeTime() const = 0;
</span><span class="cx">     virtual MediaTime duration() const = 0;
</span><span class="cx">     virtual AtomicString trackID() const = 0;
</span><ins>+    virtual size_t sizeInBytes() const = 0;
</ins><span class="cx"> 
</span><span class="cx">     enum SampleFlags {
</span><span class="cx">         None = 0,
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSampleBufferGetFormatDescription, CMFormatDescriptionRef, (CMSampleBufferRef sbuf), (sbuf))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSampleBufferGetPresentationTimeStamp, CMTime, (CMSampleBufferRef sbuf), (sbuf))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSampleBufferGetSampleAttachmentsArray, CFArrayRef, (CMSampleBufferRef sbuf, Boolean createIfNecessary), (sbuf, createIfNecessary))
</span><ins>+SOFT_LINK(CoreMedia, CMSampleBufferGetTotalSampleSize, size_t, (CMSampleBufferRef sbuf), (sbuf))
</ins><span class="cx"> SOFT_LINK(CoreMedia, CMFormatDescriptionGetMediaSubType, FourCharCode, (CMFormatDescriptionRef desc), (desc))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMSetAttachment, void, (CMAttachmentBearerRef target, CFStringRef key, CFTypeRef value, CMAttachmentMode attachmentMode), (target, key, value, attachmentMode))
</span><span class="cx"> SOFT_LINK(CoreMedia, CMVideoFormatDescriptionGetPresentationDimensions, CGSize, (CMVideoFormatDescriptionRef videoDesc, Boolean usePixelAspectRatio, Boolean useCleanAperture), (videoDesc, usePixelAspectRatio, useCleanAperture))
</span><span class="lines">@@ -292,6 +293,7 @@
</span><span class="cx">     virtual MediaTime decodeTime() const override { return toMediaTime(CMSampleBufferGetDecodeTimeStamp(m_sample.get())); }
</span><span class="cx">     virtual MediaTime duration() const override { return toMediaTime(CMSampleBufferGetDuration(m_sample.get())); }
</span><span class="cx">     virtual AtomicString trackID() const override { return m_id; }
</span><ins>+    virtual size_t sizeInBytes() const override { return CMSampleBufferGetTotalSampleSize(m_sample.get()); }
</ins><span class="cx"> 
</span><span class="cx">     virtual SampleFlags flags() const override;
</span><span class="cx">     virtual PlatformSample platformSample() override;
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreplatformmockmediasourceMockSourceBufferPrivatecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp (169209 => 169210)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp        2014-05-22 18:25:46 UTC (rev 169209)
+++ branches/safari-538.34-branch/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp        2014-05-22 19:06:49 UTC (rev 169210)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">     virtual MediaTime decodeTime() const override { return m_box.decodeTimestamp(); }
</span><span class="cx">     virtual MediaTime duration() const override { return m_box.duration(); }
</span><span class="cx">     virtual AtomicString trackID() const override { return m_id; }
</span><ins>+    virtual size_t sizeInBytes() const override { return sizeof(m_box); }
</ins><span class="cx"> 
</span><span class="cx">     virtual SampleFlags flags() const override;
</span><span class="cx">     virtual PlatformSample platformSample() override;
</span></span></pre>
</div>
</div>

</body>
</html>