<!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>[192252] 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/192252">192252</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 10:03:04 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Force display: block on ::-webkit-media-controls.
https://bugs.webkit.org/show_bug.cgi?id=149178
<rdar://problem/23448397>
Reviewed by Simon Fraser.
This patch ensures that we always have a block level container for media controls
so that continuation never needs to split RenderMedia into multiple subtrees.
Current inline continuation logic assumes that only inline elements with RenderInline
type of renderers participate in continuation. This is mostly the case since other inline renderers
such as RenderReplaced, RenderImage, RenderEmbeddedObject etc can't have (accessible) children.
(Unlike video::-webkit-media-controls)
Source/WebCore:
Test: media/webkit-media-controls-display.html
* Modules/mediacontrols/mediaControlsApple.css:
(::-webkit-media-controls):
* Modules/mediacontrols/mediaControlsiOS.css:
(::-webkit-media-controls):
* css/mediaControls.css:
(::-webkit-media-controls):
LayoutTests:
* media/webkit-media-controls-display-expected.txt: Added.
* media/webkit-media-controls-display.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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#trunkSourceWebCorecssmediaControlscss">trunk/Source/WebCore/css/mediaControls.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediawebkitmediacontrolsdisplayexpectedtxt">trunk/LayoutTests/media/webkit-media-controls-display-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediawebkitmediacontrolsdisplayhtml">trunk/LayoutTests/media/webkit-media-controls-display.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192251 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-11-10 17:57:32 UTC (rev 192251)
+++ trunk/LayoutTests/ChangeLog 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-10 Zalan Bujtas <zalan@apple.com>
+
+ Force display: block on ::-webkit-media-controls.
+ https://bugs.webkit.org/show_bug.cgi?id=149178
+ <rdar://problem/23448397>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we always have a block level container for media controls
+ so that continuation never needs to split RenderMedia into multiple subtrees.
+
+ Current inline continuation logic assumes that only inline elements with RenderInline
+ type of renderers participate in continuation. This is mostly the case since other inline renderers
+ such as RenderReplaced, RenderImage, RenderEmbeddedObject etc can't have (accessible) children.
+ (Unlike video::-webkit-media-controls)
+
+ * media/webkit-media-controls-display-expected.txt: Added.
+ * media/webkit-media-controls-display.html: Added.
+
</ins><span class="cx"> 2015-11-10 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Remove WebKit specific XHR timeout tests in favor of WPT version
</span></span></pre></div>
<a id="trunkLayoutTestsmediawebkitmediacontrolsdisplayexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/webkit-media-controls-display-expected.txt (0 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/webkit-media-controls-display-expected.txt (rev 0)
+++ trunk/LayoutTests/media/webkit-media-controls-display-expected.txt 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Overloading ::-webkit-media-controls display property. PASS if it doesn't crash.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediawebkitmediacontrolsdisplayhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/webkit-media-controls-display.html (0 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/webkit-media-controls-display.html (rev 0)
+++ trunk/LayoutTests/media/webkit-media-controls-display.html 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<p>Overloading ::-webkit-media-controls display property. PASS if it doesn't crash.</p>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var displayValues = ["-webkit-box", "-webkit-flex", "-webkit-inline-box",
+ "-webkit-inline-flex", "block", "flex", "grid", "inline", "inline-block",
+ "inline-flex", "inline-grid", "inline-table", "list-item", "none", "table",
+ "table-caption", "table-cell", "table-column", "table-column-group",
+ "table-footer-group", "table-header-group", "table-row", "table-row-group"];
+
+var styleSheet = "video { width: 200px; height: 30px; }\n";
+
+displayValues.forEach(function(value, idx) {
+ var video = document.createElement("video");
+ video.controls = true;
+ video.id = "video" + idx;
+ document.body.appendChild(video);
+
+ styleSheet += "#video" + idx + "::-webkit-media-controls { display: " + value + " !important; }\n";
+});
+
+var style = document.createElement("style");
+style.textContent = styleSheet;
+document.head.appendChild(style);
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192251 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-10 17:57:32 UTC (rev 192251)
+++ trunk/Source/WebCore/ChangeLog 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-11-10 Zalan Bujtas <zalan@apple.com>
+
+ Force display: block on ::-webkit-media-controls.
+ https://bugs.webkit.org/show_bug.cgi?id=149178
+ <rdar://problem/23448397>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we always have a block level container for media controls
+ so that continuation never needs to split RenderMedia into multiple subtrees.
+
+ Current inline continuation logic assumes that only inline elements with RenderInline
+ type of renderers participate in continuation. This is mostly the case since other inline renderers
+ such as RenderReplaced, RenderImage, RenderEmbeddedObject etc can't have (accessible) children.
+ (Unlike video::-webkit-media-controls)
+
+ Test: media/webkit-media-controls-display.html
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (::-webkit-media-controls):
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (::-webkit-media-controls):
+ * css/mediaControls.css:
+ (::-webkit-media-controls):
+
</ins><span class="cx"> 2015-11-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use CROSS_PLATFORM_CONTEXT_MENUS
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (192251 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-10 17:57:32 UTC (rev 192251)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> width: inherit;
</span><span class="cx"> height: inherit;
</span><span class="cx"> position: relative;
</span><del>- display: -webkit-flex;
</del><ins>+ display: -webkit-flex !important;
</ins><span class="cx"> -webkit-align-items: stretch;
</span><span class="cx"> -webkit-justify-content: flex-end;
</span><span class="cx"> -webkit-flex-direction: column;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (192251 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-11-10 17:57:32 UTC (rev 192251)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> width: inherit;
</span><span class="cx"> height: inherit;
</span><span class="cx"> position: relative;
</span><del>- display: -webkit-flex;
</del><ins>+ display: -webkit-flex !important;
</ins><span class="cx"> -webkit-align-items: stretch;
</span><span class="cx"> -webkit-justify-content: flex-end;
</span><span class="cx"> -webkit-flex-direction: column;
</span></span></pre></div>
<a id="trunkSourceWebCorecssmediaControlscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/mediaControls.css (192251 => 192252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/mediaControls.css 2015-11-10 17:57:32 UTC (rev 192251)
+++ trunk/Source/WebCore/css/mediaControls.css 2015-11-10 18:03:04 UTC (rev 192252)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> width: inherit;
</span><span class="cx"> height: inherit;
</span><span class="cx"> position: relative;
</span><del>- display: flex;
</del><ins>+ display: flex !important;
</ins><span class="cx"> align-items: flex-start;
</span><span class="cx"> justify-content: flex-end;
</span><span class="cx"> flex-direction: column;
</span></span></pre>
</div>
</div>
</body>
</html>