<!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>[172213] trunk</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/172213">172213</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-08-07 09:23:05 -0700 (Thu, 07 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac, iOS] Captions are appearing multiple times during repeated video play through
https://bugs.webkit.org/show_bug.cgi?id=135680
Source/WebCore:
<rdar://problem/17926802>
Reviewed by Eric Carlson.
Test: media/track/track-in-band-cues-added-once.html
Revert TextTrackCueGeneric::isOrderedBefore logic to its original form, and add
a new 'isOrderedBeforeDuringDisplay' for the special case of displaying captions.
* html/shadow/MediaControlElements.cpp:
(WebCore::compareCueIntervalForDisplay): Added helper function.
(WebCore::MediaControlTextTrackContainerElement::updateDisplay): Use the new
'isOrderedBeforeDuringDisplay' to order the cues for display.
* html/track/TextTrackCue.h:
(WebCore::TextTrackCue::isOrderedBeforeDuringDisplay): Added. This just
calls the existing 'isOrderedBefore' method.
* html/track/TextTrackCueGeneric.cpp:
(WebCore::TextTrackCueGeneric::isOrderedBefore): Revert to logic used
prior to <a href="http://trac.webkit.org/projects/webkit/changeset/171700">r171700</a>.
(WebCore::TextTrackCueGeneric::isOrderedBeforeDuringDisplay): New method that
implements the behavior in <a href="http://trac.webkit.org/projects/webkit/changeset/171700">r171700</a>.
* html/track/TextTrackCueGeneric.h:
LayoutTests:
<rdar://problem/17926802>
Reviewed by Eric Carlson.
Reactivate the 'track-in-band-cues-added-once.html' test. We would have caught
this bug immediately if the test had been enabled.
* platform/mac/TestExpectations: Turn 'track-in-band-cues-added-once.html' back
on.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCueh">trunk/Source/WebCore/html/track/TextTrackCue.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCueGenericcpp">trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCueGenerich">trunk/Source/WebCore/html/track/TextTrackCueGeneric.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/LayoutTests/ChangeLog 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac, iOS] Captions are appearing multiple times during repeated video play through
+ https://bugs.webkit.org/show_bug.cgi?id=135680
+ <rdar://problem/17926802>
+
+ Reviewed by Eric Carlson.
+
+ Reactivate the 'track-in-band-cues-added-once.html' test. We would have caught
+ this bug immediately if the test had been enabled.
+
+ * platform/mac/TestExpectations: Turn 'track-in-band-cues-added-once.html' back
+ on.
+
</ins><span class="cx"> 2014-08-07 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL gardening
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -1195,8 +1195,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/123490 [ Mavericks ] webaudio/oscillator-sawtooth.html [ Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/123498 [ Mavericks ] media/track/track-in-band-cues-added-once.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/123522 [ Mavericks ] media/track/track-in-band-legacy-api.html [ Pass Failure ]
</span><span class="cx">
</span><span class="cx"> # Audio and video tracks aren't supported on mac
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/Source/WebCore/ChangeLog 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-08-06 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac, iOS] Captions are appearing multiple times during repeated video play through
+ https://bugs.webkit.org/show_bug.cgi?id=135680
+ <rdar://problem/17926802>
+
+ Reviewed by Eric Carlson.
+
+ Test: media/track/track-in-band-cues-added-once.html
+
+ Revert TextTrackCueGeneric::isOrderedBefore logic to its original form, and add
+ a new 'isOrderedBeforeDuringDisplay' for the special case of displaying captions.
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::compareCueIntervalForDisplay): Added helper function.
+ (WebCore::MediaControlTextTrackContainerElement::updateDisplay): Use the new
+ 'isOrderedBeforeDuringDisplay' to order the cues for display.
+ * html/track/TextTrackCue.h:
+ (WebCore::TextTrackCue::isOrderedBeforeDuringDisplay): Added. This just
+ calls the existing 'isOrderedBefore' method.
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGeneric::isOrderedBefore): Revert to logic used
+ prior to r171700.
+ (WebCore::TextTrackCueGeneric::isOrderedBeforeDuringDisplay): New method that
+ implements the behavior in r171700.
+ * html/track/TextTrackCueGeneric.h:
+
</ins><span class="cx"> 2014-08-07 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Taking a paused video full screen flashes black at beginning of animation.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -1096,6 +1096,11 @@
</span><span class="cx"> return createRenderer<RenderTextTrackContainerElement>(*this, WTF::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool compareCueIntervalForDisplay(const CueInterval& one, const CueInterval& two)
+{
+ return one.data()->isPositionedAbove(two.data());
+};
+
</ins><span class="cx"> void MediaControlTextTrackContainerElement::updateDisplay()
</span><span class="cx"> {
</span><span class="cx"> if (!mediaController()->closedCaptionsVisible())
</span><span class="lines">@@ -1149,7 +1154,12 @@
</span><span class="cx"> // them so that the new cue is at the bottom.
</span><span class="cx"> if (childNodeCount() < activeCues.size())
</span><span class="cx"> removeChildren();
</span><del>-
</del><ins>+
+ // Sort the active cues for the appropriate display order. For example, for roll-up
+ // or paint-on captions, we need to add the cues in reverse chronological order,
+ // so that the newest captions appear at the bottom.
+ std::sort(activeCues.begin(), activeCues.end(), &compareCueIntervalForDisplay);
+
</ins><span class="cx"> // 10. For each text track cue cue in cues that has not yet had
</span><span class="cx"> // corresponding CSS boxes added to output, in text track cue order, run the
</span><span class="cx"> // following substeps:
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCue.h (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackCue.h 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/Source/WebCore/html/track/TextTrackCue.h 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> virtual ScriptExecutionContext* scriptExecutionContext() const override final { return &m_scriptExecutionContext; }
</span><span class="cx">
</span><span class="cx"> virtual bool isOrderedBefore(const TextTrackCue*) const;
</span><ins>+ virtual bool isPositionedAbove(const TextTrackCue* cue) const { return isOrderedBefore(cue); }
</ins><span class="cx">
</span><span class="cx"> bool hasEquivalentStartTime(const TextTrackCue&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -202,6 +202,9 @@
</span><span class="cx">
</span><span class="cx"> bool TextTrackCueGeneric::isOrderedBefore(const TextTrackCue* that) const
</span><span class="cx"> {
</span><ins>+ if (VTTCue::isOrderedBefore(that))
+ return true;
+
</ins><span class="cx"> if (that->cueType() == Generic && startTime() == that->startTime() && endTime() == that->endTime()) {
</span><span class="cx"> // Further order generic cues by their calculated line value.
</span><span class="cx"> std::pair<double, double> thisPosition = getPositionCoordinates();
</span><span class="lines">@@ -209,6 +212,18 @@
</span><span class="cx"> return thisPosition.second > thatPosition.second || (thisPosition.second == thatPosition.second && thisPosition.first < thatPosition.first);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ return false;
+}
+
+bool TextTrackCueGeneric::isPositionedAbove(const TextTrackCue* that) const
+{
+ if (that->cueType() == Generic && startTime() == that->startTime() && endTime() == that->endTime()) {
+ // Further order generic cues by their calculated line value.
+ std::pair<double, double> thisPosition = getPositionCoordinates();
+ std::pair<double, double> thatPosition = toVTTCue(that)->getPositionCoordinates();
+ return thisPosition.second > thatPosition.second || (thisPosition.second == thatPosition.second && thisPosition.first < thatPosition.first);
+ }
+
</ins><span class="cx"> if (that->cueType() == Generic)
</span><span class="cx"> return startTime() > that->startTime();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCueGenerich"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCueGeneric.h (172212 => 172213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackCueGeneric.h 2014-08-07 16:06:06 UTC (rev 172212)
+++ trunk/Source/WebCore/html/track/TextTrackCueGeneric.h 2014-08-07 16:23:05 UTC (rev 172213)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isOrderedBefore(const TextTrackCue*) const override;
</span><ins>+ virtual bool isPositionedAbove(const TextTrackCue*) const override;
</ins><span class="cx">
</span><span class="cx"> TextTrackCueGeneric(ScriptExecutionContext&, double start, double end, const String&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>