<!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>[160734] 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/160734">160734</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-17 16:16:31 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Video element's width and height content attributes should not influence intrinsic width and height
https://bugs.webkit.org/show_bug.cgi?id=125822
Reviewed by Darin Adler.
Source/WebCore:
Merge https://chromium.googlesource.com/chromium/blink/+/022ce34efb5b70cb964c3ca29f23c8980ffaef05
The width/height content attributes already influence specified style via
HTMLVideoElement::collectStyleForPresentationAttribute, to also influence the intrinsic size has never
been part of the spec: http://www.w3.org/TR/2013/WD-html51-20130528/embedded-content-0.html#dom-dim-width
The test case passes in Firefox Nightly and IE11 Release Preview, but fails in Opera Presto, which has
no default intrinsic size.
Test: media/video-intrinsic-width-height.html
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::calculateIntrinsicSize):
LayoutTests:
* media/video-intrinsic-width-height-expected.txt: Added.
* media/video-intrinsic-width-height.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderVideocpp">trunk/Source/WebCore/rendering/RenderVideo.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediavideointrinsicwidthheightexpectedtxt">trunk/LayoutTests/media/video-intrinsic-width-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediavideointrinsicwidthheighthtml">trunk/LayoutTests/media/video-intrinsic-width-height.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160733 => 160734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-18 00:15:02 UTC (rev 160733)
+++ trunk/LayoutTests/ChangeLog 2013-12-18 00:16:31 UTC (rev 160734)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-17 Ryosuke Niwa <rniwa@webkit.org>
+
+ Video element's width and height content attributes should not influence intrinsic width and height
+ https://bugs.webkit.org/show_bug.cgi?id=125822
+
+ Reviewed by Darin Adler.
+
+ * media/video-intrinsic-width-height-expected.txt: Added.
+ * media/video-intrinsic-width-height.html: Added.
+
</ins><span class="cx"> 2013-12-17 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PageVisibilityStateUnloaded
</span></span></pre></div>
<a id="trunkLayoutTestsmediavideointrinsicwidthheightexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-intrinsic-width-height-expected.txt (0 => 160734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-intrinsic-width-height-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-intrinsic-width-height-expected.txt 2013-12-18 00:16:31 UTC (rev 160734)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+
+
+PASS no width/height attributes
+PASS only width attribute
+PASS only height attribute
+PASS both width/height attributes
+PASS both width/height attributes and style
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideointrinsicwidthheighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/video-intrinsic-width-height.html (0 => 160734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-intrinsic-width-height.html (rev 0)
+++ trunk/LayoutTests/media/video-intrinsic-width-height.html 2013-12-18 00:16:31 UTC (rev 160734)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>video element intrinsic width/height</title>
+ <script src="../resources/testharness.js"></script>
+ <script src="../resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <div id="log"></div>
+ <video title="no width/height attributes"
+ data-expected-width="300" data-expected-height="150"></video>
+ <video title="only width attribute"
+ data-expected-width="100" data-expected-height="50"
+ width="100"></video>
+ <video title="only height attribute"
+ data-expected-width="200" data-expected-height="100"
+ height="100"></video>
+ <video title="both width/height attributes"
+ data-expected-width="100" data-expected-height="100"
+ width="100" height="100"></video>
+ <!-- A width:height ratio other than 2:1 and overriding the specified style must be used to
+ verify that width/height does not influence intrinsic ratio -->
+ <video title="both width/height attributes and style"
+ data-expected-width="300" data-expected-height="150"
+ width="100" height="100" style="width: auto; height: auto"></video>
+ <script>
+ Array.prototype.forEach.call(document.querySelectorAll('video'), function(video)
+ {
+ test(function()
+ {
+ assert_equals(video.clientWidth, parseInt(video.dataset.expectedWidth), "width");
+ assert_equals(video.clientHeight, parseInt(video.dataset.expectedHeight), "height");
+ }, video.title);
+ });
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160733 => 160734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-18 00:15:02 UTC (rev 160733)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 00:16:31 UTC (rev 160734)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2013-12-17 Ryosuke Niwa <rniwa@webkit.org>
+
+ Video element's width and height content attributes should not influence intrinsic width and height
+ https://bugs.webkit.org/show_bug.cgi?id=125822
+
+ Reviewed by Darin Adler.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/022ce34efb5b70cb964c3ca29f23c8980ffaef05
+
+ The width/height content attributes already influence specified style via
+ HTMLVideoElement::collectStyleForPresentationAttribute, to also influence the intrinsic size has never
+ been part of the spec: http://www.w3.org/TR/2013/WD-html51-20130528/embedded-content-0.html#dom-dim-width
+
+ The test case passes in Firefox Nightly and IE11 Release Preview, but fails in Opera Presto, which has
+ no default intrinsic size.
+
+ Test: media/video-intrinsic-width-height.html
+
+ * rendering/RenderVideo.cpp:
+ (WebCore::RenderVideo::calculateIntrinsicSize):
+
</ins><span class="cx"> 2013-12-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore/html changes
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderVideocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderVideo.cpp (160733 => 160734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderVideo.cpp 2013-12-18 00:15:02 UTC (rev 160733)
+++ trunk/Source/WebCore/rendering/RenderVideo.cpp 2013-12-18 00:16:31 UTC (rev 160734)
</span><span class="lines">@@ -116,14 +116,6 @@
</span><span class="cx"> if (videoElement().shouldDisplayPosterImage() && !m_cachedImageSize.isEmpty() && !imageResource()->errorOccurred())
</span><span class="cx"> return m_cachedImageSize;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- // When the natural size of the video is unavailable, we use the provided
- // width and height attributes of the video element as the intrinsic size until
- // better values become available.
- if (videoElement().hasAttribute(widthAttr) && videoElement().hasAttribute(heightAttr))
- return LayoutSize(videoElement().width(), videoElement().height());
-#endif
-
</del><span class="cx"> // <video> in standalone media documents should not use the default 300x150
</span><span class="cx"> // size since they also have audio-only files. By setting the intrinsic
</span><span class="cx"> // size to 300x1 the video will resize itself in these cases, and audio will
</span></span></pre>
</div>
</div>
</body>
</html>