<!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>[169666] 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/169666">169666</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-06 16:18:46 -0700 (Fri, 06 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>GenericCueData elements prematurely removed
https://bugs.webkit.org/show_bug.cgi?id=133588
Reviewed by Eric Carlson.
Add a 'removeCompletedCues' method instead of using the 'resetCueValues' method
after processing new cues. We do not want to reset cue state if we have pending
cues that are being extended by future updates (such as paint-on cues).
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
(WebCore::InbandTextTrackPrivateAVF::processCue): Call new 'removeCompletedCues' method.
(WebCore::InbandTextTrackPrivateAVF::removeCompletedCues): Added.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFh">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169665 => 169666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-06 23:07:47 UTC (rev 169665)
+++ trunk/Source/WebCore/ChangeLog 2014-06-06 23:18:46 UTC (rev 169666)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-06-06 Brent Fulgham <bfulgham@apple.com>
+
+ GenericCueData elements prematurely removed
+ https://bugs.webkit.org/show_bug.cgi?id=133588
+
+ Reviewed by Eric Carlson.
+
+ Add a 'removeCompletedCues' method instead of using the 'resetCueValues' method
+ after processing new cues. We do not want to reset cue state if we have pending
+ cues that are being extended by future updates (such as paint-on cues).
+
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ (WebCore::InbandTextTrackPrivateAVF::processCue): Call new 'removeCompletedCues' method.
+ (WebCore::InbandTextTrackPrivateAVF::removeCompletedCues): Added.
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
+
</ins><span class="cx"> 2014-06-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Initialize a char* that needs to be initialized.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (169665 => 169666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2014-06-06 23:07:47 UTC (rev 169665)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2014-06-06 23:18:46 UTC (rev 169666)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> if (cueData->position() >= 0 && cueData->size() > 0)
</span><span class="cx"> cueData->setPosition(cueData->position() - cueData->size() / 2);
</span><span class="cx">
</span><del>- LOG(Media, "InbandTextTrackPrivateAVF::processCue(%p) - considering cue for time = %.2f, position = %.2f, line = %.2f", this, cueData->startTime(), cueData->position(), cueData->line());
</del><ins>+ LOG(Media, "InbandTextTrackPrivateAVF::processCue(%p) - considering cue (\"%s\") for time = %.2f, position = %.2f, line = %.2f", this, cueData->content().utf8().data(), cueData->startTime(), cueData->position(), cueData->line());
</ins><span class="cx">
</span><span class="cx"> cueData->setStatus(GenericCueData::Partial);
</span><span class="cx"> }
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> if (!arrivingCue->doesExtendCueData(*cueData))
</span><span class="cx"> nonExtensionCues.append(arrivingCue);
</span><span class="cx"> else
</span><del>- LOG(Media, "InbandTextTrackPrivateAVF::processCue(%p) - found an extension cue for time = %.2f, position = %.2f, line = %.2f", this, arrivingCue->startTime(), arrivingCue->position(), arrivingCue->line());
</del><ins>+ LOG(Media, "InbandTextTrackPrivateAVF::processCue(%p) - found an extension cue (\"%s\") for time = %.2f, position = %.2f, line = %.2f", this, arrivingCue->content().utf8().data(), arrivingCue->startTime(), arrivingCue->position(), arrivingCue->line());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool currentCueIsExtended = (arrivingCues.size() != nonExtensionCues.size());
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> } else
</span><span class="cx"> LOG(Media, "InbandTextTrackPrivateAVF::processCue negative length cue(s) ignored: start=%.2f, end=%.2f\n", m_currentCueStartTime, m_currentCueEndTime);
</span><span class="cx">
</span><del>- resetCueValues();
</del><ins>+ removeCompletedCues();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (arrivingCues.isEmpty())
</span><span class="lines">@@ -462,6 +462,27 @@
</span><span class="cx"> m_index = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InbandTextTrackPrivateAVF::removeCompletedCues()
+{
+ if (client()) {
+ long currentCue = m_cues.size() - 1;
+ for (; currentCue > 0; --currentCue) {
+ if (m_cues[currentCue]->status() != GenericCueData::Complete)
+ continue;
+
+ LOG(Media, "InbandTextTrackPrivateAVF::removeCompletedCues(%p) - removing cue (\"%s\") for time = %.2f, position = %.2f, line = %.2f", this, m_cues[currentCue]->content().utf8().data(), m_cues[currentCue]->startTime(), m_cues[currentCue]->position(), m_cues[currentCue]->line());
+ client()->removeGenericCue(this, m_cues[currentCue].get());
+ m_cues.remove(currentCue);
+ }
+ }
+
+ if (m_cues.isEmpty())
+ m_pendingCueStatus = None;
+
+ m_currentCueStartTime = 0;
+ m_currentCueEndTime = 0;
+}
+
</ins><span class="cx"> void InbandTextTrackPrivateAVF::resetCueValues()
</span><span class="cx"> {
</span><span class="cx"> if (m_currentCueEndTime && m_cues.size())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h (169665 => 169666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2014-06-06 23:07:47 UTC (rev 169665)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2014-06-06 23:18:46 UTC (rev 169666)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> InbandTextTrackPrivateAVF(AVFInbandTrackParent*);
</span><span class="cx">
</span><span class="cx"> void processCueAttributes(CFAttributedStringRef, GenericCueData*);
</span><ins>+ void removeCompletedCues();
</ins><span class="cx">
</span><span class="cx"> double m_currentCueStartTime;
</span><span class="cx"> double m_currentCueEndTime;
</span></span></pre>
</div>
</div>
</body>
</html>