<!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>[165815] 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/165815">165815</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-18 10:40:25 -0700 (Tue, 18 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>TextTrackRegion Not Implemented
https://bugs.webkit.org/show_bug.cgi?id=116546
Reviewed by Eric Carlson.
Merged from Blink (patch by vcarbune@chromium.org):
https://chromium.googlesource.com/chromium/blink/+/4940f89a087fea5b5ea628e98d0b355d398a9eea
http://crbug.com/25798003
Source/WebCore:
Tests: media/track/regions-webvtt/text-track-region-display.html
media/track/regions-webvtt/text-track-region-dom-layout.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::newRegionsAvailable):
* html/track/TextTrack.cpp:
* html/track/TextTrack.h:
* html/track/TextTrackRegion.cpp:
(WebCore::TextTrackRegion::TextTrackRegion):
(WebCore::TextTrackRegion::appendTextTrackCueBox):
* html/track/TextTrackRegion.h:
* html/track/VTTCue.cpp:
(WebCore::VTTCue::VTTCue):
(WebCore::VTTCue::notifyRegionWhenRemovingDisplayTree):
(WebCore::VTTCue::removeDisplayTree):
* html/track/VTTCue.h:
* html/track/WebVTTParser.cpp:
(WebCore::WebVTTParser::parseBytes):
(WebCore::WebVTTParser::collectMetadataHeader):
* html/track/WebVTTParser.h:
LayoutTests:
* media/track/captions-webvtt/captions-regions.vtt: Added.
* media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt: Rebaseline.
* media/track/regions-webvtt/text-track-region-display-expected.txt: Added.
* media/track/regions-webvtt/text-track-region-display.html: Added.
* media/track/regions-webvtt/text-track-region-dom-layout-expected.txt: Added.
* media/track/regions-webvtt/text-track-region-dom-layout.html: Added.
* media/track/regions-webvtt/text-track-region-list-expected.txt: Rebaseline.
* media/track/regions-webvtt/text-track-region-parser-expected.txt: Rebaseline.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackcueregionattributeexpectedtxt">trunk/LayoutTests/media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregionlistexpectedtxt">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-list-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregionparserexpectedtxt">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-parser-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackcpp">trunk/Source/WebCore/html/track/TextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackh">trunk/Source/WebCore/html/track/TextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackRegioncpp">trunk/Source/WebCore/html/track/TextTrackRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackRegionh">trunk/Source/WebCore/html/track/TextTrackRegion.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCueh">trunk/Source/WebCore/html/track/VTTCue.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTParsercpp">trunk/Source/WebCore/html/track/WebVTTParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackWebVTTParserh">trunk/Source/WebCore/html/track/WebVTTParser.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvttcaptionsregionsvtt">trunk/LayoutTests/media/track/captions-webvtt/captions-regions.vtt</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregiondisplayexpectedtxt">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregiondisplayhtml">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display.html</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregiondomlayoutexpectedtxt">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatrackregionswebvtttexttrackregiondomlayouthtml">trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/LayoutTests/ChangeLog 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-18 Brent Fulgham <bfulgham@apple.com>
+
+ TextTrackRegion Not Implemented
+ https://bugs.webkit.org/show_bug.cgi?id=116546
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by vcarbune@chromium.org):
+ https://chromium.googlesource.com/chromium/blink/+/4940f89a087fea5b5ea628e98d0b355d398a9eea
+ http://crbug.com/25798003
+
+ * media/track/captions-webvtt/captions-regions.vtt: Added.
+ * media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt: Rebaseline.
+ * media/track/regions-webvtt/text-track-region-display-expected.txt: Added.
+ * media/track/regions-webvtt/text-track-region-display.html: Added.
+ * media/track/regions-webvtt/text-track-region-dom-layout-expected.txt: Added.
+ * media/track/regions-webvtt/text-track-region-dom-layout.html: Added.
+ * media/track/regions-webvtt/text-track-region-list-expected.txt: Rebaseline.
+ * media/track/regions-webvtt/text-track-region-parser-expected.txt: Rebaseline.
+
</ins><span class="cx"> 2014-03-18 Krzysztof Wolanski <k.wolanski@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Update baselines and test expectations
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvttcaptionsregionsvtt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/captions-webvtt/captions-regions.vtt (0 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/captions-regions.vtt (rev 0)
+++ trunk/LayoutTests/media/track/captions-webvtt/captions-regions.vtt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+WEBVTT FILE
+Region: id=fred width=50% height=2 regionanchor=50%,100% viewportanchor=10%,40%
+
+1
+00:00:00.000 --> 00:00:01.500 region:fred
+We are in New York City
+
+2
+00:00:00.500 --> 00:00:01.500 region:fred
+Second cue
+
+3
+00:00:01.000 --> 00:00:02.500 region:fred
+Multiline
+Cue
+
+4
+00:00:02.000 --> 00:00:03.000 region:fred
+Fourth cue!
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackcueregionattributeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-cue-region-attribute-expected.txt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> Tests the regionId attribute of a cue.
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> ** Test the setter and getter through the JS API **
</span><span class="cx"> EXPECTED (cue.regionId == '') OK
</span><span class="cx"> EXPECTED (cue.regionId == 'someId') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregiondisplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display-expected.txt (0 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display-expected.txt (rev 0)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display-expected.txt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+Tests default rendering for TextTrackCues that belong to a TextTrackRegion.
+
+
+EVENT(canplaythrough)
+** The text track has only one region **
+EXPECTED (testTrack.regions.length == '1') OK
+
+** Inspecting cues displayed within region**
+
+RUN(video.currentTime = 0.2)
+EVENT(seeked)
+Total cues in region: 1
+Cue content is: We are in New York City
+Cue lines visible from this cue: 1
+EXPECTED (totalVisibleLines <= testTrack.regions[0].height == 'true') OK
+
+RUN(video.currentTime = 0.5)
+EVENT(seeked)
+Total cues in region: 2
+Cue content is: We are in New York City
+Cue lines visible from this cue: 1
+Cue content is: Second cue
+Cue lines visible from this cue: 1
+EXPECTED (totalVisibleLines <= testTrack.regions[0].height == 'true') OK
+
+RUN(video.currentTime = 1)
+EVENT(seeked)
+Total cues in region: 3
+Cue content is: We are in New York City
+Cue lines visible from this cue: 1
+Cue content is: Second cue
+Cue lines visible from this cue: 1
+Cue content is: Multiline Cue
+Cue lines visible from this cue: 0
+EXPECTED (totalVisibleLines <= testTrack.regions[0].height == 'true') OK
+
+RUN(video.currentTime = 2.3)
+EVENT(seeked)
+Total cues in region: 2
+Cue content is: Multiline Cue
+Cue lines visible from this cue: 2
+Cue content is: Fourth cue!
+Cue lines visible from this cue: 0
+EXPECTED (totalVisibleLines <= testTrack.regions[0].height == 'true') OK
+
+RUN(video.currentTime = 3)
+EVENT(seeked)
+Total cues in region: 1
+Cue content is: Fourth cue!
+Cue lines visible from this cue: 1
+EXPECTED (totalVisibleLines <= testTrack.regions[0].height == 'true') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregiondisplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display.html (0 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display.html (rev 0)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-display.html 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../../media-controls.js></script>
+ <script src=../../media-file.js></script>
+ <script src=../../video-test.js></script>
+ <script>
+ var testTrack;
+ var region;
+ var container;
+ var totalVisibleLines;
+
+ var seekTimes = [0.2, 0.5, 1.0, 2.3, 3.0];
+ var crtSeekTime = 0;
+
+ function countVisibleLines(cueElement)
+ {
+ var cueRect = cueElement.getBoundingClientRect();
+ var regionRect = region.getBoundingClientRect();
+
+ var linesMatch = cueElement.textContent.match(/\n/g);
+ var linesCount = 1 + (linesMatch == null ? 0 : linesMatch.length);
+ var lineHeight = cueRect.height / linesCount;
+
+ var visibleLines = 0;
+ for (i = 0; i < linesCount; ++i) {
+ var lineTop = cueRect.top + i * lineHeight;
+ var lineBottom = cueRect.top + (i+1) * lineHeight;
+
+ if (lineTop >= regionRect.top && lineBottom <= regionRect.bottom)
+ visibleLines++;
+ }
+
+ return visibleLines;
+ }
+
+ function testRegionsDisplay()
+ {
+ testTrack = video.textTracks[0];
+
+ consoleWrite("** The text track has only one region **");
+ testExpected("testTrack.regions.length", 1);
+
+ try {
+ region = textTrackDisplayElement(video, 'region');
+ container = textTrackDisplayElement(video, 'region-container');
+ } catch(e) {
+ consoleWrite(e);
+ }
+
+ consoleWrite("<br>** Inspecting cues displayed within region**");
+
+ waitForEvent("seeked", inspectRegionTree);
+ seekVideo();
+ }
+
+ function seekVideo()
+ {
+ consoleWrite("");
+ run("video.currentTime = " + seekTimes[crtSeekTime++]);
+ }
+
+ function inspectRegionTree()
+ {
+ consoleWrite("Total cues in region: " + container.children.length);
+ totalVisibleLines = 0;
+
+ for (var i = 0; i < container.children.length; ++i) {
+ var cue = container.children[i];
+ var cueVisibleLines = countVisibleLines(cue);
+ consoleWrite("Cue content is: " + cue.textContent);
+ consoleWrite("Cue lines visible from this cue: " + cueVisibleLines);
+
+ totalVisibleLines += cueVisibleLines;
+ }
+
+ testExpected("totalVisibleLines <= testTrack.regions[0].height", true);
+
+ if (crtSeekTime == seekTimes.length)
+ endTest();
+ else
+ seekVideo();
+ }
+
+ function startTest()
+ {
+ if (!window.TextTrackRegion) {
+ failTest();
+ return;
+ }
+
+ findMediaElement();
+
+ video.src = findMediaFile('video', '../../content/test');
+ waitForEvent('canplaythrough', testRegionsDisplay);
+ }
+
+ </script>
+ </head>
+ <body>
+ <p>Tests default rendering for TextTrackCues that belong to a TextTrackRegion.</p>
+ <video controls>
+ <track src="../captions-webvtt/captions-regions.vtt" kind="captions" default onload="startTest()">
+ </video>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregiondomlayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout-expected.txt (0 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout-expected.txt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+Tests default DOM layout structure for a TextTrackRegion.
+
+
+EVENT(canplaythrough)
+** The text track has only one region **
+EXPECTED (testTrack.regions.length == '1') OK
+
+** Inspecting the default DOM layout used for regions display **
+
+** Only one region should be displayed **
+EXPECTED (region.children.length == '1') OK
+
+** The child of the region should be the container **
+EXPECTED (region.children[0] == container == 'true') OK
+
+** Default pseudo IDs should be set properly
+EXPECTED (region.getAttribute('pseudo') == '-webkit-media-text-track-region') OK
+EXPECTED (container.getAttribute('pseudo') == '-webkit-media-text-track-region-container') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregiondomlayouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout.html (0 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout.html (rev 0)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-dom-layout.html 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <script src=../../media-controls.js></script>
+ <script src=../../media-file.js></script>
+ <script src=../../video-test.js></script>
+ <script>
+ var testTrack;
+ var region;
+ var container;
+
+ function testRegionsDisplay()
+ {
+ testTrack = video.textTracks[0];
+
+ consoleWrite("** The text track has only one region **");
+ testExpected("testTrack.regions.length", 1);
+
+ try {
+ region = textTrackDisplayElement(video, 'region');
+ container = textTrackDisplayElement(video, 'region-container');
+ } catch(e) {
+ consoleWrite(e);
+ }
+
+ consoleWrite("<br>** Inspecting the default DOM layout used for regions display **");
+
+ consoleWrite("<br>** Only one region should be displayed **");
+ testExpected("region.children.length", 1);
+
+ consoleWrite("<br>** The child of the region should be the container **");
+ testExpected("region.children[0] == container", true);
+
+ consoleWrite("<br>** Default pseudo IDs should be set properly");
+ testExpected("region.getAttribute('pseudo')", "-webkit-media-text-track-region");
+ testExpected("container.getAttribute('pseudo')", "-webkit-media-text-track-region-container");
+
+ endTest();
+ }
+
+ function startTest()
+ {
+ if (!window.TextTrackRegion) {
+ failTest();
+ return;
+ }
+
+ findMediaElement();
+
+ video.src = findMediaFile('video', '../../content/test');
+ waitForEvent('canplaythrough', testRegionsDisplay);
+ }
+
+ </script>
+ </head>
+ <body>
+ <p>Tests default DOM layout structure for a TextTrackRegion.</p>
+ <video controls>
+ <track src="../captions-webvtt/captions-regions.vtt" kind="captions" default onload="startTest()">
+ </video>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregionlistexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-list-expected.txt (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-list-expected.txt 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-list-expected.txt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> Tests TextTrackRegionList functionality: length, operator[], and getRegionById()
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> ** Implicit mode disabled and the regions attribute is null **
</span><span class="cx"> EXPECTED (testTrack.track.mode == 'disabled') OK
</span><span class="cx"> EXPECTED (testTrack.track.regions == 'null') OK
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackregionswebvtttexttrackregionparserexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/regions-webvtt/text-track-region-parser-expected.txt (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/regions-webvtt/text-track-region-parser-expected.txt 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/LayoutTests/media/track/regions-webvtt/text-track-region-parser-expected.txt 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> Tests proper parsing of various regions present in WebVTT header area.
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> EXPECTED (video.textTracks[0].regions.length == '5') OK
</span><span class="cx">
</span><span class="cx"> EXPECTED (region.id == 'region_without_settings') OK
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/ChangeLog 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-03-18 Brent Fulgham <bfulgham@apple.com>
+
+ TextTrackRegion Not Implemented
+ https://bugs.webkit.org/show_bug.cgi?id=116546
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by vcarbune@chromium.org):
+ https://chromium.googlesource.com/chromium/blink/+/4940f89a087fea5b5ea628e98d0b355d398a9eea
+ http://crbug.com/25798003
+
+ Tests: media/track/regions-webvtt/text-track-region-display.html
+ media/track/regions-webvtt/text-track-region-dom-layout.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+ * html/track/LoadableTextTrack.cpp:
+ (WebCore::LoadableTextTrack::newRegionsAvailable):
+ * html/track/TextTrack.cpp:
+ * html/track/TextTrack.h:
+ * html/track/TextTrackRegion.cpp:
+ (WebCore::TextTrackRegion::TextTrackRegion):
+ (WebCore::TextTrackRegion::appendTextTrackCueBox):
+ * html/track/TextTrackRegion.h:
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCue::VTTCue):
+ (WebCore::VTTCue::notifyRegionWhenRemovingDisplayTree):
+ (WebCore::VTTCue::removeDisplayTree):
+ * html/track/VTTCue.h:
+ * html/track/WebVTTParser.cpp:
+ (WebCore::WebVTTParser::parseBytes):
+ (WebCore::WebVTTParser::collectMetadataHeader):
+ * html/track/WebVTTParser.h:
+
</ins><span class="cx"> 2014-03-18 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] ResourceLoaderSoup.cpp was added by mistake
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1683,6 +1683,14 @@
</span><span class="cx"> CueInterval interval = m_cueTree.createInterval(cue->startTime(), endTime, cue.get());
</span><span class="cx"> m_cueTree.remove(interval);
</span><span class="cx">
</span><ins>+#if ENABLE(WEBVTT_REGIONS)
+ // Since the cue will be removed from the media element and likely the
+ // TextTrack might also be destructed, notifying the region of the cue
+ // removal shouldn't be done.
+ if (cue->isRenderable())
+ toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(false);
+#endif
+
</ins><span class="cx"> size_t index = m_currentlyActiveCues.find(interval);
</span><span class="cx"> if (index != notFound) {
</span><span class="cx"> cue->setIsActive(false);
</span><span class="lines">@@ -1692,6 +1700,11 @@
</span><span class="cx"> if (cue->isRenderable())
</span><span class="cx"> toVTTCue(cue.get())->removeDisplayTree();
</span><span class="cx"> updateActiveTextTrackCues(currentTime());
</span><ins>+
+#if ENABLE(WEBVTT_REGIONS)
+ if (cue->isRenderable())
+ toVTTCue(cue.get())->notifyRegionWhenRemovingDisplayTree(true);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013 Google Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < newRegions.size(); ++i) {
</span><span class="cx"> newRegions[i]->setTrack(this);
</span><del>- regionList()->add(newRegions[i]);
</del><ins>+ regions()->add(newRegions[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/TextTrack.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -343,11 +343,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
</span><del>-TextTrackRegionList* TextTrack::regionList()
-{
- return ensureTextTrackRegionList();
-}
-
</del><span class="cx"> TextTrackRegionList* TextTrack::ensureTextTrackRegionList()
</span><span class="cx"> {
</span><span class="cx"> if (!m_regions)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrack.h (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrack.h 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/TextTrack.h 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -159,9 +159,6 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> TextTrack(ScriptExecutionContext*, TextTrackClient*, const AtomicString& kind, const AtomicString& id, const AtomicString& label, const AtomicString& language, TextTrackType);
</span><del>-#if ENABLE(VIDEO_TRACK) && ENABLE(WEBVTT_REGIONS)
- TextTrackRegionList* regionList();
-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<TextTrackCueList> m_cues;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackRegion.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackRegion.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/TextTrackRegion.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -76,8 +76,8 @@
</span><span class="cx"> , m_regionAnchor(FloatPoint(defaultAnchorPointX, defaultAnchorPointY))
</span><span class="cx"> , m_viewportAnchor(FloatPoint(defaultAnchorPointX, defaultAnchorPointY))
</span><span class="cx"> , m_scroll(defaultScroll)
</span><ins>+ , m_cueContainer(nullptr)
</ins><span class="cx"> , m_regionDisplayTree(nullptr)
</span><del>- , m_cueContainer(nullptr)
</del><span class="cx"> , m_track(nullptr)
</span><span class="cx"> , m_currentTop(0)
</span><span class="cx"> , m_scrollTimer(this, &TextTrackRegion::scrollTimerFired)
</span><span class="lines">@@ -354,6 +354,8 @@
</span><span class="cx">
</span><span class="cx"> void TextTrackRegion::appendTextTrackCueBox(PassRefPtr<VTTCueBox> displayBox)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_cueContainer);
+
</ins><span class="cx"> if (m_cueContainer->contains(displayBox.get()))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackRegion.h (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackRegion.h 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/TextTrackRegion.h 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -136,11 +136,10 @@
</span><span class="cx">
</span><span class="cx"> bool m_scroll;
</span><span class="cx">
</span><del>- RefPtr<HTMLDivElement> m_regionDisplayTree;
-
</del><span class="cx"> // The cue container is the container that is scrolled up to obtain the
</span><span class="cx"> // effect of scrolling cues when this is enabled for the regions.
</span><span class="cx"> RefPtr<HTMLDivElement> m_cueContainer;
</span><ins>+ RefPtr<HTMLDivElement> m_regionDisplayTree;
</ins><span class="cx">
</span><span class="cx"> // The member variable track can be a raw pointer as it will never
</span><span class="cx"> // reference a destroyed TextTrack, as this member variable
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -207,6 +207,7 @@
</span><span class="cx"> , m_displayDirection(CSSValueLtr)
</span><span class="cx"> , m_displayWritingMode(CSSValueInherit)
</span><span class="cx"> , m_displaySize(0)
</span><ins>+ , m_notifyRegion(true)
</ins><span class="cx"> {
</span><span class="cx"> // 4. If the text track cue writing direction is horizontal, then let
</span><span class="cx"> // writing-mode be 'horizontal-tb'. Otherwise, if the text track cue writing
</span><span class="lines">@@ -460,6 +461,11 @@
</span><span class="cx"> m_regionId = regionId;
</span><span class="cx"> didChange();
</span><span class="cx"> }
</span><ins>+
+void VTTCue::notifyRegionWhenRemovingDisplayTree(bool notifyRegion)
+{
+ m_notifyRegion = notifyRegion;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void VTTCue::setIsActive(bool active)
</span><span class="lines">@@ -747,7 +753,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> // The region needs to be informed about the cue removal.
</span><del>- if (track()) {
</del><ins>+ if (m_notifyRegion && track()) {
</ins><span class="cx"> if (TextTrackRegionList* regions = track()->regions()) {
</span><span class="cx"> if (TextTrackRegion* region = regions->getRegionById(m_regionId))
</span><span class="cx"> region->willRemoveTextTrackCueBox(m_displayTree.get());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.h (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.h 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/VTTCue.h 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> const String& regionId() const { return m_regionId; }
</span><span class="cx"> void setRegionId(const String&);
</span><ins>+ void notifyRegionWhenRemovingDisplayTree(bool);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void setIsActive(bool);
</span><span class="lines">@@ -216,6 +217,7 @@
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="cx"> String m_regionId;
</span><span class="cx"> #endif
</span><ins>+ bool m_notifyRegion;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> VTTCue* toVTTCue(TextTrackCue*);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTParser.cpp (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTParser.cpp 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/WebVTTParser.cpp 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -167,8 +167,10 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Header:
</span><del>- // 13-18 - Allow a header (comment area) under the WEBVTT line.
</del><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><ins>+ collectMetadataHeader(line);
+
+ // 13-18 - Allow a header (comment area) under the WEBVTT line.
</ins><span class="cx"> if (line.isEmpty()) {
</span><span class="cx"> if (m_client && m_regionList.size())
</span><span class="cx"> m_client->newRegionsParsed();
</span><span class="lines">@@ -176,14 +178,7 @@
</span><span class="cx"> m_state = Id;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- collectHeader(line);
-
- break;
-
- case Metadata:
</del><span class="cx"> #endif
</span><del>- if (line.isEmpty())
- m_state = Id;
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Id:
</span><span class="lines">@@ -252,7 +247,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><del>-void WebVTTParser::collectHeader(const String& line)
</del><ins>+void WebVTTParser::collectMetadataHeader(const String& line)
</ins><span class="cx"> {
</span><span class="cx"> // 4.1 Extension of WebVTT header parsing (11 - 15)
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, regionHeaderName, ("Region", AtomicString::ConstructFromLiteral));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackWebVTTParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/WebVTTParser.h (165814 => 165815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/WebVTTParser.h 2014-03-18 15:37:28 UTC (rev 165814)
+++ trunk/Source/WebCore/html/track/WebVTTParser.h 2014-03-18 17:40:25 UTC (rev 165815)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx"> enum ParseState {
</span><span class="cx"> Initial,
</span><span class="cx"> Header,
</span><del>-#if ENABLE(WEBVTT_REGIONS)
- Metadata,
-#endif
</del><span class="cx"> Id,
</span><span class="cx"> TimingsAndSettings,
</span><span class="cx"> CueText,
</span><span class="lines">@@ -169,7 +166,7 @@
</span><span class="cx"> void resetCueValues();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><del>- void collectHeader(const String&);
</del><ins>+ void collectMetadataHeader(const String&);
</ins><span class="cx"> void createNewRegion();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>