<!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>[167402] 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/167402">167402</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 16:55:36 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaDocument on iOS should be full page
https://bugs.webkit.org/show_bug.cgi?id=131774
Reviewed by Jer Noble.
Source/WebCore:
A MediaDocument on iOS has two problems. It can't rely
on intrinsic size, since it doesn't load the content until
a user gesture. Secondly, on a small screen you want the
media to fill the page.
Add width/height 100% for iOS documents.
Test: platform/iphone-simulator/media/media-document-controls-size.html
* html/MediaDocument.cpp:
(WebCore::MediaDocumentParser::createDocumentStructure):
LayoutTests:
* platform/iphone-simulator/media/media-document-controls-size-expected.txt: Added.
* platform/iphone-simulator/media/media-document-controls-size.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="#trunkSourceWebCorehtmlMediaDocumentcpp">trunk/Source/WebCore/html/MediaDocument.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/iphone-simulator/</li>
<li>trunk/LayoutTests/platform/iphone-simulator/media/</li>
<li><a href="#trunkLayoutTestsplatformiphonesimulatormediamediadocumentcontrolssizeexpectedtxt">trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiphonesimulatormediamediadocumentcontrolssizehtml">trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167401 => 167402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-16 23:53:59 UTC (rev 167401)
+++ trunk/LayoutTests/ChangeLog        2014-04-16 23:55:36 UTC (rev 167402)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-16 Dean Jackson <dino@apple.com>
+
+ MediaDocument on iOS should be full page
+ https://bugs.webkit.org/show_bug.cgi?id=131774
+
+ Reviewed by Jer Noble.
+
+ * platform/iphone-simulator/media/media-document-controls-size-expected.txt: Added.
+ * platform/iphone-simulator/media/media-document-controls-size.html: Added.
+
</ins><span class="cx"> 2014-04-16 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a way for layout tests to determine whether or not a plugin is snapshotted.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiphonesimulatormediamediadocumentcontrolssizeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size-expected.txt (0 => 167402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size-expected.txt         (rev 0)
+++ trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size-expected.txt        2014-04-16 23:55:36 UTC (rev 167402)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+CONSOLE MESSAGE: line 145: Localized string "Start Playback" not found.
+CONSOLE MESSAGE: line 145: Localized string "Choose Wireless Display" not found.
+Test that media documents have accurately sized media.
+
+
+EXPECTED (width == '200px') OK
+EXPECTED (height == '180px') OK
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsplatformiphonesimulatormediamediadocumentcontrolssizehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size.html (0 => 167402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size.html         (rev 0)
+++ trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size.html        2014-04-16 23:55:36 UTC (rev 167402)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<p>Test that media documents have accurately sized media.<p>
+<script src="../../../media/media-file.js" type="text/javascript"></script>
+<script src="../../../media/video-test.js" type="text/javascript"></script>
+
+<iframe style="width: 200px; height: 180px; border: 0px;" id="container"> </iframe>
+
+<script type="text/javascript">
+var iframe = document.getElementById("container");
+var width, height;
+
+function runTest(event) {
+ var video = iframe.contentDocument.querySelector("video");
+ width = window.getComputedStyle(video).width;
+ height = window.getComputedStyle(video).height;
+ testExpected("width", "200px");
+ testExpected("height", "180px");
+ testRunner.notifyDone();
+};
+
+iframe.onload = runTest;
+iframe.src = "../../../media/" + findMediaFile("video", "content/test");
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/platform/iphone-simulator/media/media-document-controls-size.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167401 => 167402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-16 23:53:59 UTC (rev 167401)
+++ trunk/Source/WebCore/ChangeLog        2014-04-16 23:55:36 UTC (rev 167402)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-16 Dean Jackson <dino@apple.com>
+
+ MediaDocument on iOS should be full page
+ https://bugs.webkit.org/show_bug.cgi?id=131774
+
+ Reviewed by Jer Noble.
+
+ A MediaDocument on iOS has two problems. It can't rely
+ on intrinsic size, since it doesn't load the content until
+ a user gesture. Secondly, on a small screen you want the
+ media to fill the page.
+
+ Add width/height 100% for iOS documents.
+
+ Test: platform/iphone-simulator/media/media-document-controls-size.html
+
+ * html/MediaDocument.cpp:
+ (WebCore::MediaDocumentParser::createDocumentStructure):
+
</ins><span class="cx"> 2014-04-16 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a way for layout tests to determine whether or not a plugin is snapshotted.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.cpp (167401 => 167402)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.cpp        2014-04-16 23:53:59 UTC (rev 167401)
+++ trunk/Source/WebCore/html/MediaDocument.cpp        2014-04-16 23:55:36 UTC (rev 167402)
</span><span class="lines">@@ -91,8 +91,14 @@
</span><span class="cx"> m_mediaElement->setAttribute(autoplayAttr, "");
</span><span class="cx">
</span><span class="cx"> m_mediaElement->setAttribute(nameAttr, "media");
</span><del>- m_mediaElement->setAttribute(styleAttr, "max-width: 100%; max-height: 100%;");
</del><span class="cx">
</span><ins>+ StringBuilder elementStyle;
+ elementStyle.appendLiteral("max-width: 100%; max-height: 100%;");
+#if PLATFORM(IOS)
+ elementStyle.appendLiteral("width: 100%; height: 100%;");
+#endif
+ m_mediaElement->setAttribute(styleAttr, elementStyle.toString());
+
</ins><span class="cx"> RefPtr<Element> sourceElement = document()->createElement(sourceTag, false);
</span><span class="cx"> HTMLSourceElement& source = toHTMLSourceElement(*sourceElement);
</span><span class="cx"> source.setSrc(document()->url());
</span></span></pre>
</div>
</div>
</body>
</html>