<!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>[184361] trunk/Source/WebCore</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/184361">184361</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 16:40:29 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjust button CSS and positioning in preparation.
https://bugs.webkit.org/show_bug.cgi?id=144973.
<rdar://problem/20306227>
Reviewed by Dean Jackson.
The only visual change here is the swapping of the rewind and play button positions.
Also, position buttons based off of both left and right margins instead of just one of the two.
This allows the controls drop off to work without having to use a spacer element to take the place
of the timeline if the controls are too small.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-rewind-button):
(audio::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-panel .mute-box):
(audio::-webkit-media-controls-wireless-playback-picker-button):
(audio::-webkit-media-controls-toggle-closed-captions-button):
(audio::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-fullscreen-button.exit):
(audio::-webkit-media-controls-time-remaining-display):
(audio:-webkit-full-screen::-webkit-media-controls-toggle-closed-captions-button):
(audio:-webkit-full-screen::-webkit-media-controls-wireless-playback-picker-button):
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.configureInlineControls):</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184360 => 184361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-14 23:35:42 UTC (rev 184360)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 23:40:29 UTC (rev 184361)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-05-14 Roger Fong <roger_fong@apple.com>
+
+ Adjust button CSS and positioning in preparation.
+ https://bugs.webkit.org/show_bug.cgi?id=144973.
+ <rdar://problem/20306227>
+
+ Reviewed by Dean Jackson.
+
+ The only visual change here is the swapping of the rewind and play button positions.
+ Also, position buttons based off of both left and right margins instead of just one of the two.
+ This allows the controls drop off to work without having to use a spacer element to take the place
+ of the timeline if the controls are too small.
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-rewind-button):
+ (audio::-webkit-media-controls-play-button):
+ (audio::-webkit-media-controls-panel .mute-box):
+ (audio::-webkit-media-controls-wireless-playback-picker-button):
+ (audio::-webkit-media-controls-toggle-closed-captions-button):
+ (audio::-webkit-media-controls-fullscreen-button):
+ (audio::-webkit-media-controls-fullscreen-button.exit):
+ (audio::-webkit-media-controls-time-remaining-display):
+ (audio:-webkit-full-screen::-webkit-media-controls-toggle-closed-captions-button):
+ (audio:-webkit-full-screen::-webkit-media-controls-wireless-playback-picker-button):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.configureInlineControls):
+
</ins><span class="cx"> 2015-05-14 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaControls: controls are live even when invisible
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (184360 => 184361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-05-14 23:35:42 UTC (rev 184360)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-05-14 23:40:29 UTC (rev 184361)
</span><span class="lines">@@ -170,13 +170,15 @@
</span><span class="cx"> min-width: 16px;
</span><span class="cx"> height: 18px;
</span><span class="cx"> margin-bottom: 1px;
</span><del>- margin-left: 16px;
</del><ins>+ margin-left: 8px;
+ margin-right: 8px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-play-button,
</span><span class="cx"> audio::-webkit-media-controls-play-button {
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="rgba(255,255,255,0.45)"><rect x="0" y="1" width="4" height="13"/><rect x="8" y="1" width="4" height="13"/></svg>');
</span><del>- margin-left: 16px;
</del><ins>+ margin-left: 8px;
+ margin-right: 8px;
</ins><span class="cx"> width: 12px;
</span><span class="cx"> min-width: 12px;
</span><span class="cx"> }
</span><span class="lines">@@ -192,7 +194,8 @@
</span><span class="cx"> width: 14px;
</span><span class="cx"> min-width: 14px;
</span><span class="cx"> height: 25px;
</span><del>- margin-right: 16px;
</del><ins>+ margin-right: 8px;
+ margin-left: 8px;
</ins><span class="cx"> position: relative;
</span><span class="cx"> display: -webkit-flex;
</span><span class="cx"> -webkit-flex-direction: column;
</span><span class="lines">@@ -307,7 +310,8 @@
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-picker-button,
</span><span class="cx"> audio::-webkit-media-controls-wireless-playback-picker-button {
</span><del>- margin-right: 16px;
</del><ins>+ margin-right: 8px;
+ margin-left: 8px;
</ins><span class="cx"> width: 16px;
</span><span class="cx"> min-width: 16px;
</span><span class="cx"> }
</span><span class="lines">@@ -321,7 +325,8 @@
</span><span class="cx"> audio::-webkit-media-controls-toggle-closed-captions-button {
</span><span class="cx"> width: 16px;
</span><span class="cx"> min-width: 16px;
</span><del>- margin-right: 16px;
</del><ins>+ margin-right: 8px;
+ margin-left: 8px;
</ins><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15" stroke="rgba(255,255,255,0.45)" fill="none"><defs> <clipPath id="cut-hole"><rect x="0" y="1" width="16" height="10"/><rect x="0" y="11" width="9" height="1"/><rect x="11" y="11" width="5" height="1"/></clipPath></defs> <rect x="0.5" y="1.5" rx="1" ry="1" width="15" height="10" clip-path="url(#cut-hole)"/><path d="M 2,6.5 h 4"/><path d="M 7,6.5 h 7"/><path d="M 3,8.5 h 2"/><path d="M 6,8.5 h 3"/><path d="M 10,8.5 h 3"/><path d="M 8.5,11.5 L 8.5,13.75 L 11,11"/></
svg>');
</span><span class="cx"> outline: 0;
</span><span class="cx"> }
</span><span class="lines">@@ -420,6 +425,7 @@
</span><span class="cx"> audio::-webkit-media-controls-fullscreen-button {
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 15" stroke="rgba(255,255,255,0.45)" fill="none"><path d="M 7,1.5 L 12.5,1.5 L 12.5,7"/><path d="M 0.5,8 L 0.5,13.5 L 6,13.5"/><path stroke-linecap="round" d="M 12.5,1.5 L 7.5,6.5"/><path stroke-linecap="round" d="M 0.5,13.5 L 5.5,8.5"/></svg>');
</span><span class="cx"> margin-right: 7px;
</span><ins>+ margin-left: 8px;
</ins><span class="cx"> width: 14px;
</span><span class="cx"> min-width: 14px;
</span><span class="cx"> }
</span><span class="lines">@@ -428,6 +434,7 @@
</span><span class="cx"> audio::-webkit-media-controls-fullscreen-button.exit {
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 15" stroke="rgba(255,255,255,0.45)" fill="none"><path d="M 7.5,1 L 7.5,6.5 L 13,6.5"/><path d="M 0,8.5 L 5.5,8.5 L 5.5,14"/><path stroke-linecap="round" d="M 7.5,6.5 L 12.5,1.5"/><path stroke-linecap="round" d="M 5.5,8.5 L 0.5,13.5"/></svg>');
</span><span class="cx"> margin-right: 11px;
</span><ins>+ margin-left: 0px;
</ins><span class="cx"> margin-top: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -513,7 +520,7 @@
</span><span class="cx"> video::-webkit-media-controls-time-remaining-display,
</span><span class="cx"> audio::-webkit-media-controls-time-remaining-display {
</span><span class="cx"> margin-left: 8px;
</span><del>- margin-right: 16px;
</del><ins>+ margin-right: 8px;
</ins><span class="cx"> width: 37px;
</span><span class="cx"> min-width: 37px;
</span><span class="cx"> -webkit-justify-content: flex-start;
</span><span class="lines">@@ -771,12 +778,14 @@
</span><span class="cx"> audio:-webkit-full-screen::-webkit-media-controls-toggle-closed-captions-button {
</span><span class="cx"> margin-top: 6px;
</span><span class="cx"> margin-right:24px;
</span><ins>+ margin-left: 0px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video:-webkit-full-screen::-webkit-media-controls-wireless-playback-picker-button,
</span><span class="cx"> audio:-webkit-full-screen::-webkit-media-controls-wireless-playback-picker-button {
</span><span class="cx"> margin-top: 6px;
</span><span class="cx"> margin-right:24px;
</span><ins>+ margin-left: 0px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video:-webkit-full-screen::-webkit-media-controls-closed-captions-container {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (184360 => 184361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-14 23:35:42 UTC (rev 184360)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-14 23:40:29 UTC (rev 184361)
</span><span class="lines">@@ -535,9 +535,9 @@
</span><span class="cx"> this.controls.panel.appendChild(this.controls.panelBackgroundContainer);
</span><span class="cx"> this.controls.panelBackgroundContainer.appendChild(this.controls.panelBackground);
</span><span class="cx"> this.controls.panelBackgroundContainer.appendChild(this.controls.panelTint);
</span><del>- this.controls.panel.appendChild(this.controls.playButton);
</del><span class="cx"> if (!this.isLive)
</span><span class="cx"> this.controls.panel.appendChild(this.controls.rewindButton);
</span><ins>+ this.controls.panel.appendChild(this.controls.playButton);
</ins><span class="cx"> this.controls.panel.appendChild(this.controls.statusDisplay);
</span><span class="cx"> if (!this.isLive) {
</span><span class="cx"> this.controls.panel.appendChild(this.controls.timelineBox);
</span></span></pre>
</div>
</div>
</body>
</html>