<!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>[186934] branches/safari-601.1-branch/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/186934">186934</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-16 22:32:42 -0700 (Thu, 16 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186837">r186837</a>. rdar://problem/21774358</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186933 => 186934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:39 UTC (rev 186933)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:42 UTC (rev 186934)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186837. rdar://problem/21774358
+
+ 2015-07-14 Dean Jackson <dino@apple.com>
+
+ Placeholder colors should be system grays
+ https://bugs.webkit.org/show_bug.cgi?id=146955
+ <rdar://problem/21774358>
+
+ Reviewed by Sam Weinig.
+
+ Update the PiP and Airplay placards to use the correct shades
+ of gray.
+
+ * Modules/mediacontrols/mediaControlsApple.css: No need to specify the
+ font here, nor have rules for Picture in Picture, which isn't available
+ on OS X.
+ (audio::-webkit-media-controls-time-remaining-display): We should specify
+ font style here.
+ (video:-webkit-full-screen::-webkit-media-controls-panel): Drive-by cleanup.
+ (audio::-webkit-media-controls-wireless-playback-status): Use a gray background
+ and system gray for text and artwork.
+ (audio::-webkit-media-controls-wireless-playback-status.small): Ditto.
+ (audio::-webkit-media-controls-picture-in-picture-button): Deleted (not on OS X).
+ (audio::-webkit-media-controls-wireless-playback-text-top): Deleted use of background color.
+ (audio::-webkit-media-controls-wireless-playback-text-bottom): Ditto..
+
+ * Modules/mediacontrols/mediaControlsiOS.css: Use a gray background
+ and system gray for text and artwork.
+ (audio::-webkit-media-controls-wireless-playback-status):
+ (audio::-webkit-media-controls-wireless-playback-text-top):
+ (audio::-webkit-media-controls-wireless-playback-status.picture-in-picture):
+
+2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186828. rdar://problem/19925709
</span><span class="cx">
</span><span class="cx"> 2015-07-14 Andreas Kling <akling@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (186933 => 186934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-07-17 05:32:39 UTC (rev 186933)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-07-17 05:32:42 UTC (rev 186934)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><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><del>- font: -webkit-small-control;
</del><span class="cx"> white-space: nowrap;
</span><span class="cx"> -webkit-font-smoothing: subpixel-antialiased;
</span><span class="cx"> }
</span><span class="lines">@@ -469,12 +468,6 @@
</span><span class="cx"> margin-top: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-picture-in-picture-button,
-audio::-webkit-media-controls-picture-in-picture-button {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" transform="rotate(90,0,0)"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 7,8 m 0,6 -2,-2 -2,2 c 0,0 -1,1 -2,0 -1,-1 0,-2 0,-2 l 2,-2 -2,-2 6,0 z" style="fill:url(#gradient) "/><path d="M 8,7 m 0,-6 2,2 2,-2 c 0,0 1,-1 2,0 1,1 0,2 0
,2 l -2,2 2,2 -6,0 z" style="fill:url(#gradient) "/></svg>');
- margin: 0 7px;
-}
-
</del><span class="cx"> video::-webkit-media-controls-status-display,
</span><span class="cx"> audio::-webkit-media-controls-status-display {
</span><span class="cx"> cursor: default;
</span><span class="lines">@@ -542,6 +535,9 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> bottom: 0.5px;
</span><span class="cx"> font-family: -apple-system-monospaced-numbers;
</span><ins>+ font-size: 11px !important;
+ font-style: normal !important;
+ font-weight: normal !important;
</ins><span class="cx"> -webkit-text-size-adjust: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -651,18 +647,18 @@
</span><span class="cx">
</span><span class="cx"> /* Full Screen */
</span><span class="cx">
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> Page stylesheets are not allowed to override the style of media
</span><span class="cx"> controls while in full screen mode, so many if not all the rules
</span><span class="cx"> defined in this section will be marked as !important to enforce
</span><del>- this restriction
</del><ins>+ this restriction
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> video:-webkit-full-screen::-webkit-media-controls-panel {
</span><span class="cx"> -webkit-align-items: flex-start !important;
</span><span class="cx"> -webkit-justify-content: flex-end !important;
</span><span class="cx"> -webkit-clip-path: inset(20px round 6px);
</span><del>-
</del><ins>+
</ins><span class="cx"> width: 480px !important;
</span><span class="cx"> height: 104px !important;
</span><span class="cx"> margin: 0 auto 12px auto !important;
</span><span class="lines">@@ -984,13 +980,13 @@
</span><span class="cx"> top: 0px;
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><del>- background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 131 90"><g fill="none" stroke="rgb(146,146,146)" stroke-width="4"><rect x="2" y="2" width="127" height="76"/><line x1="30" y1="88" x2="101" y2="88"/></g></svg>');
- background-color: black;
</del><ins>+ background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 131 90"><g fill="none" stroke="-apple-system-gray" stroke-width="4"><rect x="2" y="2" width="127" height="76"/><line x1="30" y1="88" x2="101" y2="88"/></g></svg>');
+ background-color: rgb(51, 51, 53);
</ins><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> background-position: 50% calc(.5 * (100% - 25px) - 21pt);
</span><span class="cx"> background-size: 131px auto;
</span><del>- color: rgb(145,145,145);
- font: -webkit-small-control;
</del><ins>+ color: -apple-system-gray;
+ font-family: -apple-system;
</ins><span class="cx"> vertical-align: text-bottom;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1015,7 +1011,6 @@
</span><span class="cx"> font-size: 12pt;
</span><span class="cx"> text-align: center;
</span><span class="cx"> margin: 0px;
</span><del>- background-color: black;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-text-bottom,
</span><span class="lines">@@ -1032,12 +1027,11 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> text-overflow: ellipsis;
</span><span class="cx"> margin: 0px;
</span><del>- background-color: black;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-status.small,
</span><span class="cx"> audio::-webkit-media-controls-wireless-playback-status.small {
</span><del>- background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 62 43"><g fill="none" stroke="rgb(146,146,146)" stroke-width="2"><rect x="1" y="1" width="60" height="36"/><line x1="14" y1="42" x2="48" y2="42"/></g></svg>');
</del><ins>+ background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 62 43"><g fill="none" stroke="-apple-system-gray" stroke-width="2"><rect x="1" y="1" width="60" height="36"/><line x1="14" y1="42" x2="48" y2="42"/></g></svg>');
</ins><span class="cx"> background-position: 50% calc(.5 * (100% - 25px) - 5pt);
</span><span class="cx"> background-size: 62px auto;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (186933 => 186934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-17 05:32:39 UTC (rev 186933)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-17 05:32:42 UTC (rev 186934)
</span><span class="lines">@@ -607,12 +607,12 @@
</span><span class="cx"> top: 0px;
</span><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><del>- background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 131 90"><g fill="none" stroke="rgb(146,146,146)" stroke-width="4"><rect x="2" y="2" width="127" height="76"/><line x1="30" y1="88" x2="101" y2="88"/></g></svg>');
- background-color: black;
</del><ins>+ background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 131 90"><g fill="none" stroke="-apple-system-gray" stroke-width="4"><rect x="2" y="2" width="127" height="76"/><line x1="30" y1="88" x2="101" y2="88"/></g></svg>');
+ background-color: rgb(51, 51, 53);
</ins><span class="cx"> background-repeat: no-repeat;
</span><span class="cx"> background-position: 50% calc(.5 * (100% - 25px) - 21pt);
</span><span class="cx"> background-size: 131px auto;
</span><del>- color: rgb(145,145,145);
</del><ins>+ color: -apple-system-gray;
</ins><span class="cx"> font: -apple-system;
</span><span class="cx"> font-weight: 400;
</span><span class="cx"> vertical-align: text-bottom;
</span><span class="lines">@@ -639,7 +639,7 @@
</span><span class="cx"> font-size: 12pt;
</span><span class="cx"> text-align: center;
</span><span class="cx"> margin: 0px;
</span><del>- color: rgb(255,255,255);
</del><ins>+ color: -apple-system-gray;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-text-bottom,
</span><span class="lines">@@ -678,10 +678,9 @@
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-status.picture-in-picture,
</span><span class="cx"> audio::-webkit-media-controls-wireless-playback-status.picture-in-picture
</span><span class="cx"> {
</span><del>- background-color: #ccc;
</del><span class="cx"> background-size: 304px auto;
</span><span class="cx"> background-position: 50% calc(.5 * (100% - 25px));
</span><del>- background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 304 150"><g fill="none" stroke="#8e8e93" stroke-width="3"><path d="m 172,106 -81,0 c -3.5,0 -6,-2.5 -6,-6 l 0,-89 c 0,-3.5 2.5,-6 6,-6 l 122,0 c 3.5,0 6,2.5 6,6 l 0,57" /><path d="m 233,119 -53,0 c -3,0 -3,-0 -3,-3 l 0,-40 c 0,-3 0,-3 3,-3 l 53,0 c 3,0 3,0 3,3 l 0,40 c 0,3 0,3 -3,3 z" /></g></svg>');
</del><ins>+ background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 304 150"><g fill="none" stroke="-apple-system-gray" stroke-width="3"><path d="m 172,106 -81,0 c -3.5,0 -6,-2.5 -6,-6 l 0,-89 c 0,-3.5 2.5,-6 6,-6 l 122,0 c 3.5,0 6,2.5 6,6 l 0,57" /><path d="m 233,119 -53,0 c -3,0 -3,-0 -3,-3 l 0,-40 c 0,-3 0,-3 3,-3 l 53,0 c 3,0 3,0 3,3 l 0,40 c 0,3 0,3 -3,3 z" /></g></svg>');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-text-top.picture-in-picture,
</span></span></pre>
</div>
</div>
</body>
</html>