<!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>[244014] releases/WebKitGTK/webkit-2.24/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/244014">244014</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-08 05:39:43 -0700 (Mon, 08 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/243341">r243341</a> - Inband Text Track cues interspersed with Data cues can display out of order.
https://bugs.webkit.org/show_bug.cgi?id=196095

Reviewed by Eric Carlson.

The compareCueIntervalForDisplay() comparator depends on a virtual function, isPositionedAbove(TextTrackCue* other),
but this comparison returns inconsistent results for cueA->isPositionedAbove(cueB) and cueB->isPositionedAbove(cueA)
if the two cues are different subclasses of TextTrackCue.

The underlying algorithm should be fixed in a future patch, but for now, remove all non-displaying cues from the array
of activeCues before sorting, rather than after when iterating over the sorted list of activeCues.

* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateDisplay):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCorehtmlshadowMediaControlElementscpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (244013 => 244014)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-04-08 12:39:39 UTC (rev 244013)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-04-08 12:39:43 UTC (rev 244014)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-03-21  Jer Noble  <jer.noble@apple.com>
+
+        Inband Text Track cues interspersed with Data cues can display out of order.
+        https://bugs.webkit.org/show_bug.cgi?id=196095
+
+        Reviewed by Eric Carlson.
+
+        The compareCueIntervalForDisplay() comparator depends on a virtual function, isPositionedAbove(TextTrackCue* other),
+        but this comparison returns inconsistent results for cueA->isPositionedAbove(cueB) and cueB->isPositionedAbove(cueA)
+        if the two cues are different subclasses of TextTrackCue.
+
+        The underlying algorithm should be fixed in a future patch, but for now, remove all non-displaying cues from the array
+        of activeCues before sorting, rather than after when iterating over the sorted list of activeCues.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::updateDisplay):
+
</ins><span class="cx"> 2019-03-21  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Do not insert the first-letter anonymous container until after we've constructed the first-letter renderer.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/html/shadow/MediaControlElements.cpp (244013 => 244014)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/html/shadow/MediaControlElements.cpp       2019-04-08 12:39:39 UTC (rev 244013)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/html/shadow/MediaControlElements.cpp  2019-04-08 12:39:43 UTC (rev 244014)
</span><span class="lines">@@ -1171,6 +1171,20 @@
</span><span class="cx">     if (countChildNodes() < activeCues.size())
</span><span class="cx">         removeChildren();
</span><span class="cx"> 
</span><ins>+    activeCues.removeAllMatching([] (CueInterval& cueInterval) {
+        if (!cueInterval.data() || !cueInterval.data()->isRenderable())
+            return true;
+
+        RefPtr<VTTCue> cue = toVTTCue(cueInterval.data());
+
+        return !cue->isRenderable()
+            || !cue->track()
+            || !cue->track()->isRendered()
+            || cue->track()->mode() == TextTrack::Mode::Disabled
+            || !cue->isActive()
+            || cue->text().isEmpty();
+    });
+
</ins><span class="cx">     // Sort the active cues for the appropriate display order. For example, for roll-up
</span><span class="cx">     // or paint-on captions, we need to add the cues in reverse chronological order,
</span><span class="cx">     // so that the newest captions appear at the bottom.
</span><span class="lines">@@ -1183,22 +1197,13 @@
</span><span class="cx">         if (!mediaController()->closedCaptionsVisible())
</span><span class="cx">             continue;
</span><span class="cx"> 
</span><del>-        RefPtr<TextTrackCue> textTrackCue = activeCues[i].data();
-        if (!textTrackCue->isRenderable())
</del><ins>+        RefPtr<VTTCue> cue = toVTTCue(activeCues[i].data());
+        ASSERT(cue);
+        if (!cue)
</ins><span class="cx">             continue;
</span><span class="cx"> 
</span><del>-        RefPtr<VTTCue> cue = toVTTCue(textTrackCue.get());
-
-        ASSERT(cue->isActive());
-        if (!cue->track() || !cue->track()->isRendered() || !cue->isActive() || cue->text().isEmpty())
-            continue;
-
</del><span class="cx">         LOG(Media, "MediaControlTextTrackContainerElement::updateDisplay(%p) - adding and positioning cue #%zu: \"%s\", start=%.2f, end=%.2f, line=%.2f", this, i, cue->text().utf8().data(), cue->startTime(), cue->endTime(), cue->line());
</span><del>-
</del><span class="cx">         Ref<VTTCueBox> displayBox = cue->getDisplayTree(m_videoDisplaySize.size(), m_fontSize);
</span><del>-        if (cue->track()->mode() == TextTrack::Mode::Disabled)
-            continue;
-
</del><span class="cx">         RefPtr<VTTRegion> region = cue->track()->regions()->getRegionById(cue->regionId());
</span><span class="cx">         if (!region) {
</span><span class="cx">             // If cue has an empty text track cue region identifier or there is no
</span></span></pre>
</div>
</div>

</body>
</html>