<!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>[165905] 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/165905">165905</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 12:00:14 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix cue rendering test and include support for left/right alignment
https://bugs.webkit.org/show_bug.cgi?id=130406
Reviewed by Eric Carlson.
Merged from Blink (patch by vcarbune@chromium.org):
https://chromium.googlesource.com/chromium/blink/+/e695703cb603421c741e59a557a7989113c13b94
http://crbug.com/25155003
Source/WebCore:
No new tests. Covered by media/track/track-cue-rendering-snap-to-lines-not-set.html.
* html/track/VTTCue.cpp:
(WebCore::leftKeyword): Added.
(WebCore::rightKeyword): Added.
(WebCore::VTTCueBox::applyCSSProperties): Added.
(WebCore::VTTCue::VTTCue):
(WebCore::VTTCue::align): Handle left/right alignment.
(WebCore::VTTCue::setAlign): Ditto.
(WebCore::VTTCue::calculateDisplayParameters): Refactored and revised for left/right tokens.
(WebCore::VTTCue::setCueSettings): Ditto.
(WebCore::VTTCue::getCSSAlignment): Added.
(WebCore::VTTCue::getCSSWritingMode): Added.
* html/track/VTTCue.h:
LayoutTests:
* media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt: Revised for left/right alignment tags.
* media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt: Ditto.
* media/track/track-cue-rendering-snap-to-lines-not-set.html: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvttcaptionssnaptolinesnotsetvtt">trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingsnaptolinesnotsetexpectedtxt">trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingsnaptolinesnotsethtml">trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/LayoutTests/ChangeLog 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-03-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Fix cue rendering test and include support for left/right alignment
+ https://bugs.webkit.org/show_bug.cgi?id=130406
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by vcarbune@chromium.org):
+ https://chromium.googlesource.com/chromium/blink/+/e695703cb603421c741e59a557a7989113c13b94
+ http://crbug.com/25155003
+
+ * media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt: Revised for left/right alignment tags.
+ * media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt: Ditto.
+ * media/track/track-cue-rendering-snap-to-lines-not-set.html: Ditto.
+
+2014-03-19 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> Unreviewed test system fix.
</span><span class="cx">
</span><span class="cx"> * TestExpectations: I mistakenly checked in the region-webvtt tests as enabled. This feature is not
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvttcaptionssnaptolinesnotsetvtt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-not-set.vtt 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> WEBVTT FILE
</span><span class="cx">
</span><span class="cx"> 1
</span><del>-00:00:00.000 --> 00:00:00.500
</del><ins>+00:00:00.000 --> 00:00:00.500 line:100% position:50%
</ins><span class="cx"> This is a demo track to illustrate positioning features of cues.
</span><span class="cx">
</span><span class="cx"> 2
</span><span class="lines">@@ -17,11 +17,11 @@
</span><span class="cx"> Or on the top-right corner.
</span><span class="cx">
</span><span class="cx"> 5
</span><del>-00:00:02.000 --> 00:00:02.500 line:100% position:100% align:end
</del><ins>+00:00:02.000 --> 00:00:02.500 line:100% position:100% align:right
</ins><span class="cx"> Bottom-right corner.
</span><span class="cx">
</span><span class="cx"> 6
</span><del>-00:00:02.500 --> 00:00:03.000 line:100% position:0% align:start
</del><ins>+00:00:02.500 --> 00:00:03.000 line:100% position:0% align:left
</ins><span class="cx"> And, as you might expect, the bottom-left one.
</span><span class="cx">
</span><span class="cx"> 7
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> Cues are implicitly displayed within the viewport area.
</span><span class="cx">
</span><span class="cx"> 8
</span><del>-00:00:03.500 --> 00:00:04.000 line:100% position:50%
</del><ins>+00:00:03.500 --> 00:00:04.000 line:100% position:50% align:middle
</ins><span class="cx"> And always on top of the controls, if these are visible.
</span><span class="cx">
</span><span class="cx"> 9
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> Random cue 1.
</span><span class="cx">
</span><span class="cx"> 14
</span><del>-00:00:04.000 --> 00:00:05.000 line:33% position:44%
</del><ins>+00:00:04.000 --> 00:00:05.000 line:33% position:44% align:start
</ins><span class="cx"> Random cue 2.
</span><span class="cx">
</span><span class="cx"> 15
</span><del>-00:00:04.000 --> 00:00:05.000 line:55% position:23%
</del><ins>+00:00:04.000 --> 00:00:05.000 line:55% position:23% align:start
</ins><span class="cx"> Random cue 3.
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcuerenderingsnaptolinesnotsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set-expected.txt 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -2,18 +2,15 @@
</span><span class="cx"> Test that TextTrack's cues are rendered correctly when the snap to lines flag is not set.
</span><span class="cx"> EVENT(canplaythrough)
</span><span class="cx">
</span><del>-The track container and the media controls should completely cover the video element
-EXPECTED (cueDisplayContainer.offsetHeight + controlsPanelElement.offsetHeight == video.videoHeight == 'true') OK
-EXPECTED (cueDisplayContainer.offsetWidth == video.videoWidth == 'true') OK
-
</del><span class="cx"> ** Default **
</span><span class="cx"> EVENT(seeked)
</span><span class="cx"> Active cues: 1
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'This is a demo track to illustrate positioning features of cues.') OK
</span><del>-Cue left position (percentage): 0
-Cue top position (percentage): 87
</del><ins>+Cue alignment (default or as specified): middle
+Cue left position (percentage): 50
+Cue top position (percentage): 100
</ins><span class="cx">
</span><span class="cx"> ** Center **
</span><span class="cx"> EVENT(seeked)
</span><span class="lines">@@ -21,6 +18,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Using HTML5 captions, you can position the cues anywhere.') OK
</span><ins>+Cue alignment (default or as specified): middle
</ins><span class="cx"> Cue left position (percentage): 50
</span><span class="cx"> Cue top position (percentage): 50
</span><span class="cx">
</span><span class="lines">@@ -30,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'For example, here is a cue on the top left-corner.') OK
</span><ins>+Cue alignment (default or as specified): start
</ins><span class="cx"> Cue left position (percentage): 0
</span><span class="cx"> Cue top position (percentage): 0
</span><span class="cx">
</span><span class="lines">@@ -39,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Or on the top-right corner.') OK
</span><ins>+Cue alignment (default or as specified): end
</ins><span class="cx"> Cue left position (percentage): 100
</span><span class="cx"> Cue top position (percentage): 0
</span><span class="cx">
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Bottom-right corner.') OK
</span><ins>+Cue alignment (default or as specified): right
</ins><span class="cx"> Cue left position (percentage): 100
</span><span class="cx"> Cue top position (percentage): 100
</span><span class="cx">
</span><span class="lines">@@ -57,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'And, as you might expect, the bottom-left one.') OK
</span><ins>+Cue alignment (default or as specified): left
</ins><span class="cx"> Cue left position (percentage): 0
</span><span class="cx"> Cue top position (percentage): 100
</span><span class="cx">
</span><span class="lines">@@ -66,6 +68,7 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Cues are implicitly displayed within the viewport area.') OK
</span><ins>+Cue alignment (default or as specified): middle
</ins><span class="cx"> Cue left position (percentage): 50
</span><span class="cx"> Cue top position (percentage): 50
</span><span class="cx">
</span><span class="lines">@@ -75,36 +78,43 @@
</span><span class="cx">
</span><span class="cx"> * Cue 0 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'You may even have multiple cues in the same time.') OK
</span><ins>+Cue alignment (default or as specified): middle
</ins><span class="cx"> Cue left position (percentage): 50
</span><span class="cx"> Cue top position (percentage): 50
</span><span class="cx">
</span><span class="cx"> * Cue 1 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Top-left cue.') OK
</span><ins>+Cue alignment (default or as specified): start
</ins><span class="cx"> Cue left position (percentage): 0
</span><span class="cx"> Cue top position (percentage): 0
</span><span class="cx">
</span><span class="cx"> * Cue 2 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Top-right cue.') OK
</span><ins>+Cue alignment (default or as specified): end
</ins><span class="cx"> Cue left position (percentage): 100
</span><span class="cx"> Cue top position (percentage): 7
</span><span class="cx">
</span><span class="cx"> * Cue 3 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Bottom cue.') OK
</span><ins>+Cue alignment (default or as specified): middle
</ins><span class="cx"> Cue left position (percentage): 50
</span><span class="cx"> Cue top position (percentage): 100
</span><span class="cx">
</span><span class="cx"> * Cue 4 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Random cue 1.') OK
</span><ins>+Cue alignment (default or as specified): end
</ins><span class="cx"> Cue left position (percentage): 100
</span><span class="cx"> Cue top position (percentage): 25
</span><span class="cx">
</span><span class="cx"> * Cue 5 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Random cue 2.') OK
</span><ins>+Cue alignment (default or as specified): start
</ins><span class="cx"> Cue left position (percentage): 44
</span><span class="cx"> Cue top position (percentage): 33
</span><span class="cx">
</span><span class="cx"> * Cue 6 *
</span><span class="cx"> EXPECTED (cueDisplayElement.innerText == 'Random cue 3.') OK
</span><ins>+Cue alignment (default or as specified): start
</ins><span class="cx"> Cue left position (percentage): 23
</span><span class="cx"> Cue top position (percentage): 43
</span><span class="cx"> END OF TEST
</span></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcuerenderingsnaptolinesnotsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set.html (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set.html 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/LayoutTests/media/track/track-cue-rendering-snap-to-lines-not-set.html 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> consoleWrite("Active cues: " + testTrack.track.activeCues.length);
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < testTrack.track.activeCues.length; ++i) {
</span><del>-
</del><span class="cx"> cueDisplayElement = textTrackDisplayElement(video, 'display', i);
</span><span class="cx">
</span><span class="cx"> consoleWrite("");
</span><span class="cx"> consoleWrite("* Cue " + i + " *");
</span><span class="cx"> testExpected("cueDisplayElement.innerText", testTrack.track.activeCues[i].text);
</span><ins>+ consoleWrite("Cue alignment (default or as specified): " + testTrack.track.activeCues[i].align);
</ins><span class="cx">
</span><span class="cx"> consoleWrite("Cue left position (percentage): " + Math.round(cueDisplayElement.offsetLeft / cueDisplayContainer.offsetWidth * 100));
</span><span class="cx"> consoleWrite("Cue top position (percentage): " + Math.round(cueDisplayElement.offsetTop / cueDisplayContainer.offsetHeight * 100));
</span><span class="lines">@@ -74,14 +74,6 @@
</span><span class="cx"> currentTestCase++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function testInitialContainer()
- {
- consoleWrite("");
- consoleWrite("The track container and the media controls should completely cover the video element");
- testExpected("cueDisplayContainer.offsetHeight + controlsPanelElement.offsetHeight == video.videoHeight", true);
- testExpected("cueDisplayContainer.offsetWidth == video.videoWidth", true);
- }
-
</del><span class="cx"> function loaded()
</span><span class="cx"> {
</span><span class="cx"> consoleWrite("Test that TextTrack's cues are rendered correctly when the snap to lines flag is not set.");
</span><span class="lines">@@ -93,7 +85,6 @@
</span><span class="cx">
</span><span class="cx"> waitForEvent('canplaythrough', function() {
</span><span class="cx"> cueDisplayContainer = textTrackDisplayElement(video);
</span><del>- testInitialContainer();
</del><span class="cx"> runNextTestCase();
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-03-19 Brent Fulgham <bfulgham@apple.com>
+
+ Fix cue rendering test and include support for left/right alignment
+ https://bugs.webkit.org/show_bug.cgi?id=130406
+
+ Reviewed by Eric Carlson.
+
+ Merged from Blink (patch by vcarbune@chromium.org):
+ https://chromium.googlesource.com/chromium/blink/+/e695703cb603421c741e59a557a7989113c13b94
+ http://crbug.com/25155003
+
+ No new tests. Covered by media/track/track-cue-rendering-snap-to-lines-not-set.html.
+
+ * html/track/VTTCue.cpp:
+ (WebCore::leftKeyword): Added.
+ (WebCore::rightKeyword): Added.
+ (WebCore::VTTCueBox::applyCSSProperties): Added.
+ (WebCore::VTTCue::VTTCue):
+ (WebCore::VTTCue::align): Handle left/right alignment.
+ (WebCore::VTTCue::setAlign): Ditto.
+ (WebCore::VTTCue::calculateDisplayParameters): Refactored and revised for left/right tokens.
+ (WebCore::VTTCue::setCueSettings): Ditto.
+ (WebCore::VTTCue::getCSSAlignment): Added.
+ (WebCore::VTTCue::getCSSWritingMode): Added.
+ * html/track/VTTCue.h:
+
</ins><span class="cx"> 2014-03-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add new functionality that will be required by the history item decoding
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2011, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2011-2014 Apple 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 are
</span><span class="lines">@@ -59,6 +59,16 @@
</span><span class="cx">
</span><span class="cx"> static const int undefinedPosition = -1;
</span><span class="cx">
</span><ins>+static const CSSValueID displayWritingModeMap[] = {
+ CSSValueHorizontalTb, CSSValueVerticalRl, CSSValueVerticalLr
+};
+COMPILE_ASSERT(WTF_ARRAY_LENGTH(displayWritingModeMap) == VTTCue::NumberOfWritingDirections, displayWritingModeMap_has_wrong_size);
+
+static const CSSValueID displayAlignmentMap[] = {
+ CSSValueStart, CSSValueCenter, CSSValueEnd, CSSValueLeft, CSSValueRight
+};
+COMPILE_ASSERT(WTF_ARRAY_LENGTH(displayAlignmentMap) == VTTCue::NumberOfAlignments, displayAlignmentMap_has_wrong_size);
+
</ins><span class="cx"> static const String& startKeyword()
</span><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(const String, start, (ASCIILiteral("start")));
</span><span class="lines">@@ -77,6 +87,18 @@
</span><span class="cx"> return end;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const String& leftKeyword()
+{
+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, left, ("left"));
+ return left;
+}
+
+static const String& rightKeyword()
+{
+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, right, ("right"));
+ return right;
+}
+
</ins><span class="cx"> static const String& horizontalKeyword()
</span><span class="cx"> {
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -153,12 +175,7 @@
</span><span class="cx"> // be set to the value in the second cell of the row of the table below
</span><span class="cx"> // whose first cell is the value of the corresponding cue's text track cue
</span><span class="cx"> // alignment:
</span><del>- if (m_cue->align() == startKeyword())
- setInlineStyleProperty(CSSPropertyTextAlign, CSSValueStart);
- else if (m_cue->align() == endKeyword())
- setInlineStyleProperty(CSSPropertyTextAlign, CSSValueEnd);
- else
- setInlineStyleProperty(CSSPropertyTextAlign, CSSValueCenter);
</del><ins>+ setInlineStyleProperty(CSSPropertyTextAlign, m_cue->getCSSAlignment());
</ins><span class="cx">
</span><span class="cx"> if (!m_cue->snapToLines()) {
</span><span class="cx"> // 10.13.1 Set up x and y:
</span><span class="lines">@@ -205,18 +222,9 @@
</span><span class="cx"> , m_cueBackgroundBox(HTMLSpanElement::create(spanTag, toDocument(context)))
</span><span class="cx"> , m_displayTreeShouldChange(true)
</span><span class="cx"> , m_displayDirection(CSSValueLtr)
</span><del>- , m_displayWritingMode(CSSValueInherit)
</del><span class="cx"> , m_displaySize(0)
</span><span class="cx"> , m_notifyRegion(true)
</span><span class="cx"> {
</span><del>- // 4. If the text track cue writing direction is horizontal, then let
- // writing-mode be 'horizontal-tb'. Otherwise, if the text track cue writing
- // direction is vertical growing left, then let writing-mode be
- // 'vertical-rl'. Otherwise, the text track cue writing direction is
- // vertical growing right; let writing-mode be 'vertical-lr'.
- m_displayWritingModeMap[Horizontal] = CSSValueHorizontalTb;
- m_displayWritingModeMap[VerticalGrowingLeft] = CSSValueVerticalRl;
- m_displayWritingModeMap[VerticalGrowingRight] = CSSValueVerticalLr;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> VTTCue::~VTTCue()
</span><span class="lines">@@ -363,6 +371,10 @@
</span><span class="cx"> return middleKeyword();
</span><span class="cx"> case End:
</span><span class="cx"> return endKeyword();
</span><ins>+ case Left:
+ return leftKeyword();
+ case Right:
+ return rightKeyword();
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -384,6 +396,10 @@
</span><span class="cx"> alignment = Middle;
</span><span class="cx"> else if (value == endKeyword())
</span><span class="cx"> alignment = End;
</span><ins>+ else if (value == leftKeyword())
+ alignment = Left;
+ else if (value == rightKeyword())
+ alignment = Right;
</ins><span class="cx"> else
</span><span class="cx"> ec = SYNTAX_ERR;
</span><span class="cx">
</span><span class="lines">@@ -576,65 +592,80 @@
</span><span class="cx"> // vertical growing left, then let block-flow be 'lr'. Otherwise, the text
</span><span class="cx"> // track cue writing direction is vertical growing right; let block-flow be
</span><span class="cx"> // 'rl'.
</span><del>- m_displayWritingMode = m_displayWritingModeMap[m_writingDirection];
</del><span class="cx">
</span><ins>+ // The above step is done through the writing direction static map.
+
</ins><span class="cx"> // 10.5 Determine the value of maximum size for cue as per the appropriate
</span><span class="cx"> // rules from the following list:
</span><span class="cx"> int maximumSize = m_textPosition;
</span><span class="cx"> if ((m_writingDirection == Horizontal && m_cueAlignment == Start && m_displayDirection == CSSValueLtr)
</span><span class="cx"> || (m_writingDirection == Horizontal && m_cueAlignment == End && m_displayDirection == CSSValueRtl)
</span><del>- || (m_writingDirection == VerticalGrowingLeft && m_cueAlignment == Start)
- || (m_writingDirection == VerticalGrowingRight && m_cueAlignment == Start)) {
</del><ins>+ || (m_writingDirection == Horizontal && m_cueAlignment == Left)
+ || (m_writingDirection == VerticalGrowingLeft && (m_cueAlignment == Start || m_cueAlignment == Left))
+ || (m_writingDirection == VerticalGrowingRight && (m_cueAlignment == Start || m_cueAlignment == Left))) {
</ins><span class="cx"> maximumSize = 100 - m_textPosition;
</span><span class="cx"> } else if ((m_writingDirection == Horizontal && m_cueAlignment == End && m_displayDirection == CSSValueLtr)
</span><span class="cx"> || (m_writingDirection == Horizontal && m_cueAlignment == Start && m_displayDirection == CSSValueRtl)
</span><del>- || (m_writingDirection == VerticalGrowingLeft && m_cueAlignment == End)
- || (m_writingDirection == VerticalGrowingRight && m_cueAlignment == End)) {
</del><ins>+ || (m_writingDirection == Horizontal && m_cueAlignment == Right)
+ || (m_writingDirection == VerticalGrowingLeft && (m_cueAlignment == End || m_cueAlignment == Right))
+ || (m_writingDirection == VerticalGrowingRight && (m_cueAlignment == End || m_cueAlignment == Right))) {
</ins><span class="cx"> maximumSize = m_textPosition;
</span><span class="cx"> } else if (m_cueAlignment == Middle) {
</span><span class="cx"> maximumSize = m_textPosition <= 50 ? m_textPosition : (100 - m_textPosition);
</span><span class="cx"> maximumSize = maximumSize * 2;
</span><del>- }
</del><ins>+ } else
+ ASSERT_NOT_REACHED();
</ins><span class="cx">
</span><span class="cx"> // 10.6 If the text track cue size is less than maximum size, then let size
</span><span class="cx"> // be text track cue size. Otherwise, let size be maximum size.
</span><span class="cx"> m_displaySize = std::min(m_cueSize, maximumSize);
</span><span class="cx">
</span><ins>+ // FIXME: Understand why step 10.7 is missing (just a copy/paste error?)
+ // Could be done within a spec implementation check - http://crbug.com/301580
+
</ins><span class="cx"> // 10.8 Determine the value of x-position or y-position for cue as per the
</span><span class="cx"> // appropriate rules from the following list:
</span><span class="cx"> if (m_writingDirection == Horizontal) {
</span><del>- if (m_cueAlignment == Start) {
</del><ins>+ switch (m_cueAlignment) {
+ case Start:
</ins><span class="cx"> if (m_displayDirection == CSSValueLtr)
</span><span class="cx"> m_displayPosition.first = m_textPosition;
</span><span class="cx"> else
</span><span class="cx"> m_displayPosition.first = 100 - m_textPosition - m_displaySize;
</span><del>- } else if (m_cueAlignment == End) {
</del><ins>+ break;
+ case End:
</ins><span class="cx"> if (m_displayDirection == CSSValueRtl)
</span><span class="cx"> m_displayPosition.first = 100 - m_textPosition;
</span><span class="cx"> else
</span><span class="cx"> m_displayPosition.first = m_textPosition - m_displaySize;
</span><ins>+ break;
+ case Left:
+ if (m_displayDirection == CSSValueLtr)
+ m_displayPosition.first = m_textPosition;
+ else
+ m_displayPosition.first = 100 - m_textPosition;
+ break;
+ case Right:
+ if (m_displayDirection == CSSValueLtr)
+ m_displayPosition.first = m_textPosition - m_displaySize;
+ else
+ m_displayPosition.first = 100 - m_textPosition - m_displaySize;
+ break;
+ case Middle:
+ if (m_displayDirection == CSSValueLtr)
+ m_displayPosition.first = m_textPosition - m_displaySize / 2;
+ else
+ m_displayPosition.first = 100 - m_textPosition - m_displaySize / 2;
+ break;
+ case NumberOfAlignments:
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((m_writingDirection == VerticalGrowingLeft && m_cueAlignment == Start)
- || (m_writingDirection == VerticalGrowingRight && m_cueAlignment == Start)) {
- m_displayPosition.second = m_textPosition;
- } else if ((m_writingDirection == VerticalGrowingLeft && m_cueAlignment == End)
- || (m_writingDirection == VerticalGrowingRight && m_cueAlignment == End)) {
- m_displayPosition.second = 100 - m_textPosition;
- }
</del><ins>+ // A text track cue has a text track cue computed line position whose value
+ // is defined in terms of the other aspects of the cue.
+ m_computedLinePosition = calculateComputedLinePosition();
</ins><span class="cx">
</span><del>- if (m_writingDirection == Horizontal && m_cueAlignment == Middle) {
- if (m_displayDirection == CSSValueLtr)
- m_displayPosition.first = m_textPosition - m_displaySize / 2;
- else
- m_displayPosition.first = 100 - m_textPosition - m_displaySize / 2;
- }
-
- if ((m_writingDirection == VerticalGrowingLeft && m_cueAlignment == Middle)
- || (m_writingDirection == VerticalGrowingRight && m_cueAlignment == Middle))
- m_displayPosition.second = m_textPosition - m_displaySize / 2;
-
</del><span class="cx"> // 10.9 Determine the value of whichever of x-position or y-position is not
</span><span class="cx"> // yet calculated for cue as per the appropriate rules from the following
</span><span class="cx"> // list:
</span><span class="lines">@@ -650,10 +681,6 @@
</span><span class="cx">
</span><span class="cx"> if (!m_snapToLines && (m_writingDirection == VerticalGrowingLeft || m_writingDirection == VerticalGrowingRight))
</span><span class="cx"> m_displayPosition.first = m_computedLinePosition;
</span><del>-
- // A text track cue has a text track cue computed line position whose value
- // is defined in terms of the other aspects of the cue.
- m_computedLinePosition = calculateComputedLinePosition();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VTTCue::markFutureAndPastNodes(ContainerNode* root, double previousTimestamp, double movieTime)
</span><span class="lines">@@ -1020,6 +1047,14 @@
</span><span class="cx"> // 3. If value is a case-sensitive match for the string "end", then let cue's text track cue alignment be end alignment.
</span><span class="cx"> else if (cueAlignment == endKeyword())
</span><span class="cx"> m_cueAlignment = End;
</span><ins>+
+ // 4. If value is a case-sensitive match for the string "left", then let cue's text track cue alignment be left alignment.
+ else if (cueAlignment == leftKeyword())
+ m_cueAlignment = Left;
+
+ // 5. If value is a case-sensitive match for the string "right", then let cue's text track cue alignment be right alignment.
+ else if (cueAlignment == rightKeyword())
+ m_cueAlignment = Right;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> #if ENABLE(WEBVTT_REGIONS)
</span><span class="lines">@@ -1046,6 +1081,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CSSValueID VTTCue::getCSSAlignment() const
+{
+ return displayAlignmentMap[m_cueAlignment];
+}
+
</ins><span class="cx"> CSSValueID VTTCue::getCSSWritingDirection() const
</span><span class="cx"> {
</span><span class="cx"> return m_displayDirection;
</span><span class="lines">@@ -1053,7 +1093,7 @@
</span><span class="cx">
</span><span class="cx"> CSSValueID VTTCue::getCSSWritingMode() const
</span><span class="cx"> {
</span><del>- return m_displayWritingMode;
</del><ins>+ return displayWritingModeMap[m_writingDirection];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int VTTCue::getCSSSize() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.h (165904 => 165905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.h 2014-03-19 18:27:51 UTC (rev 165904)
+++ trunk/Source/WebCore/html/track/VTTCue.h 2014-03-19 19:00:14 UTC (rev 165905)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Google Inc. All rights reserved.
- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2012-2014 Apple 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 are
</span><span class="lines">@@ -127,12 +127,13 @@
</span><span class="cx">
</span><span class="cx"> std::pair<double, double> getCSSPosition() const;
</span><span class="cx">
</span><ins>+ CSSValueID getCSSAlignment() const;
</ins><span class="cx"> int getCSSSize() const;
</span><span class="cx"> CSSValueID getCSSWritingDirection() const;
</span><span class="cx"> CSSValueID getCSSWritingMode() const;
</span><span class="cx">
</span><span class="cx"> enum WritingDirection {
</span><del>- Horizontal,
</del><ins>+ Horizontal = 0,
</ins><span class="cx"> VerticalGrowingLeft,
</span><span class="cx"> VerticalGrowingRight,
</span><span class="cx"> NumberOfWritingDirections
</span><span class="lines">@@ -140,9 +141,12 @@
</span><span class="cx"> WritingDirection getWritingDirection() const { return m_writingDirection; }
</span><span class="cx">
</span><span class="cx"> enum CueAlignment {
</span><del>- Start,
</del><ins>+ Start = 0,
</ins><span class="cx"> Middle,
</span><del>- End
</del><ins>+ End,
+ Left,
+ Right,
+ NumberOfAlignments
</ins><span class="cx"> };
</span><span class="cx"> CueAlignment getAlignment() const { return m_cueAlignment; }
</span><span class="cx">
</span><span class="lines">@@ -208,9 +212,6 @@
</span><span class="cx">
</span><span class="cx"> CSSValueID m_displayDirection;
</span><span class="cx">
</span><del>- CSSValueID m_displayWritingModeMap[NumberOfWritingDirections];
- CSSValueID m_displayWritingMode;
-
</del><span class="cx"> int m_displaySize;
</span><span class="cx">
</span><span class="cx"> std::pair<float, float> m_displayPosition;
</span></span></pre>
</div>
</div>
</body>
</html>