<!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>[144814] 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/144814">144814</a></dd>
<dt>Author</dt> <dd>vcarbune@chromium.org</dd>
<dt>Date</dt> <dd>2013-03-05 14:02:27 -0800 (Tue, 05 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cue line-height property shouldn't be inherited from the video element
https://bugs.webkit.org/show_bug.cgi?id=111262

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/track/track-cue-rendering-on-resize.html

* css/mediaControls.css:
(video::-webkit-media-text-track-container): Set the default font size
and family using the &quot;font&quot; property to also reset the line-height property.

LayoutTests:

* media/track/captions-webvtt/captions-snap-to-lines-set.vtt: Updated.
* media/track/track-cue-rendering-on-resize-expected.txt: Added.
* media/track/track-cue-rendering-on-resize.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediatrackcaptionswebvttcaptionssnaptolinessetvtt">trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-set.vtt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssmediaControlscss">trunk/Source/WebCore/css/mediaControls.css</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingonresizeexpectedtxt">trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingonresizehtml">trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (144813 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-03-05 21:48:34 UTC (rev 144813)
+++ trunk/LayoutTests/ChangeLog        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-03-05  Victor Carbune  &lt;vcarbune@chromium.org&gt;
+
+        Cue line-height property shouldn't be inherited from the video element
+        https://bugs.webkit.org/show_bug.cgi?id=111262
+
+        Reviewed by Eric Carlson.
+
+        * media/track/captions-webvtt/captions-snap-to-lines-set.vtt: Updated.
+        * media/track/track-cue-rendering-on-resize-expected.txt: Added.
+        * media/track/track-cue-rendering-on-resize.html: Added.
+
</ins><span class="cx"> 2013-03-05  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsmediatrackcaptionswebvttcaptionssnaptolinessetvtt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-set.vtt (144813 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-set.vtt        2013-03-05 21:48:34 UTC (rev 144813)
+++ trunk/LayoutTests/media/track/captions-webvtt/captions-snap-to-lines-set.vtt        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -47,3 +47,8 @@
</span><span class="cx"> 6
</span><span class="cx"> 00:00:00.500 --&gt; 00:00:01.000 vertical:lr
</span><span class="cx"> Cue 6: 私は立派な人
</span><ins>+
+7
+00:00:01.000 --&gt; 00:00:01.250
+Multi-line cue to test that should appear
+correct when in the full-screen mode
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcuerenderingonresizeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt (0 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt                                (rev 0)
+++ trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Line height isn't overriden by other CSS values in the file.
+EVENT(canplaythrough)
+EVENT(seeked)
+
+** Line height of the cue element should be 'normal' **
+EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == 'normal') OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediatracktrackcuerenderingonresizehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html (0 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html                                (rev 0)
+++ trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+    &lt;head&gt;
+        &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot; /&gt;
+
+        &lt;style type=&quot;text/css&quot;&gt;
+        body {
+            line-height: 108px;
+        }
+        &lt;/style&gt;
+        &lt;script src=../media-file.js&gt;&lt;/script&gt;
+        &lt;script src=../media-controls.js&gt;&lt;/script&gt;
+
+        &lt;script&gt;
+        var multiLineCueDisplayElement;
+
+        function testCueHeight()
+        {
+            if (!window.internals) {
+              failTest();
+              return;
+            }
+
+            var cueContainerElement = textTrackDisplayElement(video);
+            multiLineCueDisplayElement = textTrackDisplayElement(video, 'display', 0);
+
+            consoleWrite(&quot;&lt;br&gt;** Line height of the cue element should be 'normal' **&quot;);
+            testExpected(&quot;getComputedStyle(multiLineCueDisplayElement).lineHeight&quot;, &quot;normal&quot;);
+
+            endTest();
+        }
+
+        function loaded()
+        {
+            consoleWrite(&quot;Line height isn't overriden by other CSS values in the file.&quot;);
+            findMediaElement();
+
+            testTrack = document.querySelector('track');
+            video.src = findMediaFile('video', '../content/test');
+
+            waitForEvent('seeked', testCueHeight);
+            waitForEvent('canplaythrough', function() {
+                video.currentTime = 1.25;
+            });
+        }
+
+        &lt;/script&gt;
+
+        &lt;script src=../video-test.js&gt;&lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;loaded()&quot;&gt;
+        &lt;video controls&gt;
+            &lt;track src=&quot;captions-webvtt/captions-snap-to-lines-set.vtt&quot; kind=&quot;captions&quot; default&gt;
+        &lt;/video&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (144813 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-03-05 21:48:34 UTC (rev 144813)
+++ trunk/Source/WebCore/ChangeLog        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-03-05  Victor Carbune  &lt;vcarbune@chromium.org&gt;
+
+        Cue line-height property shouldn't be inherited from the video element
+        https://bugs.webkit.org/show_bug.cgi?id=111262
+
+        Reviewed by Eric Carlson.
+
+        Test: media/track/track-cue-rendering-on-resize.html
+
+        * css/mediaControls.css:
+        (video::-webkit-media-text-track-container): Set the default font size
+        and family using the &quot;font&quot; property to also reset the line-height property.
+
</ins><span class="cx"> 2013-03-05  Joshua Bell  &lt;jsbell@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         IndexedDB: Remove some unused binding code
</span></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mediaControls.css (144813 => 144814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControls.css        2013-03-05 21:48:34 UTC (rev 144813)
+++ trunk/Source/WebCore/css/mediaControls.css        2013-03-05 22:02:27 UTC (rev 144814)
</span><span class="lines">@@ -221,8 +221,7 @@
</span><span class="cx">     overflow: hidden;
</span><span class="cx">     padding-bottom: 5px;
</span><span class="cx"> 
</span><del>-    font-size: 22px;
-    font-family: sans-serif;
</del><ins>+    font: 22px sans-serif;
</ins><span class="cx">     text-align: center;
</span><span class="cx">     color: rgba(255, 255, 255, 1);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>