<!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>[180118] 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/180118">180118</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-14 20:44:49 -0800 (Sat, 14 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>IncompleteMetaDataCue leak seen on leaks bot
https://bugs.webkit.org/show_bug.cgi?id=141611
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-02-14
Reviewed by Eric Carlson.
* platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h:
(WebCore::IncompleteMetaDataCue::IncompleteMetaDataCue): Deleted.
(WebCore::IncompleteMetaDataCue::~IncompleteMetaDataCue): Deleted.
(WebCore::IncompleteMetaDataCue::cueData): Deleted.
(WebCore::IncompleteMetaDataCue::startTime): Deleted.
Convert to a struct and hold a list of structs instead of pointers.
* platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp:
(WebCore::InbandMetadataTextTrackPrivateAVF::addDataCue):
(WebCore::InbandMetadataTextTrackPrivateAVF::updatePendingCueEndTimes):
(WebCore::InbandMetadataTextTrackPrivateAVF::flushPartialCues):
Update use of IncompleteMetaDataCue and modernize related code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFh">trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180117 => 180118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-15 02:42:19 UTC (rev 180117)
+++ trunk/Source/WebCore/ChangeLog 2015-02-15 04:44:49 UTC (rev 180118)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-02-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ IncompleteMetaDataCue leak seen on leaks bot
+ https://bugs.webkit.org/show_bug.cgi?id=141611
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h:
+ (WebCore::IncompleteMetaDataCue::IncompleteMetaDataCue): Deleted.
+ (WebCore::IncompleteMetaDataCue::~IncompleteMetaDataCue): Deleted.
+ (WebCore::IncompleteMetaDataCue::cueData): Deleted.
+ (WebCore::IncompleteMetaDataCue::startTime): Deleted.
+ Convert to a struct and hold a list of structs instead of pointers.
+
+ * platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp:
+ (WebCore::InbandMetadataTextTrackPrivateAVF::addDataCue):
+ (WebCore::InbandMetadataTextTrackPrivateAVF::updatePendingCueEndTimes):
+ (WebCore::InbandMetadataTextTrackPrivateAVF::flushPartialCues):
+ Update use of IncompleteMetaDataCue and modernize related code.
+
</ins><span class="cx"> 2015-02-09 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: remove some unnecessary Inspector prefixes from class names in Inspector namespace
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp (180117 => 180118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp 2015-02-15 02:42:19 UTC (rev 180117)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp 2015-02-15 04:44:49 UTC (rev 180118)
</span><span class="lines">@@ -64,18 +64,16 @@
</span><span class="cx"> RefPtr<SerializedPlatformRepresentation> cueData = prpCueData;
</span><span class="cx"> m_currentCueStartTime = start;
</span><span class="cx"> if (end.isPositiveInfinite())
</span><del>- m_incompleteCues.append(new IncompleteMetaDataCue(start, cueData));
</del><ins>+ m_incompleteCues.append(IncompleteMetaDataCue { cueData.get(), start });
</ins><span class="cx"> client()->addDataCue(this, start, end, cueData, type);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InbandMetadataTextTrackPrivateAVF::updatePendingCueEndTimes(const MediaTime& time)
</span><span class="cx"> {
</span><span class="cx"> if (time >= m_currentCueStartTime) {
</span><del>- for (size_t i = 0; i < m_incompleteCues.size(); i++) {
- IncompleteMetaDataCue* partialCue = m_incompleteCues[i];
-
- LOG(Media, "InbandMetadataTextTrackPrivateAVF::addDataCue(%p) - updating cue: start=%s, end=%s", this, toString(partialCue->startTime()).utf8().data(), toString(time).utf8().data());
- client()->updateDataCue(this, partialCue->startTime(), time, partialCue->cueData());
</del><ins>+ for (auto& partialCue : m_incompleteCues) {
+ LOG(Media, "InbandMetadataTextTrackPrivateAVF::addDataCue(%p) - updating cue: start=%s, end=%s", this, toString(partialCue.startTime).utf8().data(), toString(time).utf8().data());
+ client()->updateDataCue(this, partialCue.startTime, time, partialCue.cueData);
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> LOG(Media, "InbandMetadataTextTrackPrivateAVF::addDataCue negative length cue(s) ignored: start=%s, end=%s\n", toString(m_currentCueStartTime).utf8().data(), toString(time).utf8().data());
</span><span class="lines">@@ -91,10 +89,8 @@
</span><span class="cx"> LOG(Media, "InbandMetadataTextTrackPrivateAVF::resetCueValues flushing incomplete data for cues: start=%s\n", toString(m_currentCueStartTime).utf8().data());
</span><span class="cx">
</span><span class="cx"> if (client()) {
</span><del>- for (size_t i = 0; i < m_incompleteCues.size(); i++) {
- IncompleteMetaDataCue* partialCue = m_incompleteCues[i];
- client()->removeDataCue(this, partialCue->startTime(), MediaTime::positiveInfiniteTime(), partialCue->cueData());
- }
</del><ins>+ for (auto& partialCue : m_incompleteCues)
+ client()->removeDataCue(this, partialCue.startTime, MediaTime::positiveInfiniteTime(), partialCue.cueData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_incompleteCues.resize(0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandMetadataTextTrackPrivateAVFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h (180117 => 180118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h 2015-02-15 02:42:19 UTC (rev 180117)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.h 2015-02-15 04:44:49 UTC (rev 180118)
</span><span class="lines">@@ -33,21 +33,9 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><del>-class IncompleteMetaDataCue {
-public:
- IncompleteMetaDataCue(const MediaTime& time, PassRefPtr<SerializedPlatformRepresentation> cueData)
- : m_cueData(cueData)
- , m_startTime(time)
- {
- }
- ~IncompleteMetaDataCue() { }
-
- RefPtr<SerializedPlatformRepresentation> cueData() const { return m_cueData; }
- MediaTime startTime() const { return m_startTime; }
-
-private:
- RefPtr<SerializedPlatformRepresentation> m_cueData;
- MediaTime m_startTime;
</del><ins>+struct IncompleteMetaDataCue {
+ RefPtr<SerializedPlatformRepresentation> cueData;
+ MediaTime startTime;
</ins><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -77,7 +65,7 @@
</span><span class="cx"> AtomicString m_inBandMetadataTrackDispatchType;
</span><span class="cx"> MediaTime m_currentCueStartTime;
</span><span class="cx"> #if ENABLE(DATACUE_VALUE)
</span><del>- Vector<IncompleteMetaDataCue*> m_incompleteCues;
</del><ins>+ Vector<IncompleteMetaDataCue> m_incompleteCues;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>