<!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>[181178] 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/181178">181178</a></dd>
<dt>Author</dt> <dd>roger_fong@apple.com</dd>
<dt>Date</dt> <dd>2015-03-06 13:29:29 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reskin Captions button and container on OSX.
https://bugs.webkit.org/show_bug.cgi?id=142383.
<rdar://problem/20061466>
Reviewed by Eric Carlson.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-toggle-closed-captions-button): Create new captions button icon.
Update caption container to match rest of media controls better.
(audio::-webkit-media-controls-closed-captions-container):
(audio::-webkit-media-controls-closed-captions-container .list):
(audio::-webkit-media-controls-closed-captions-container h3):
(audio::-webkit-media-controls-closed-captions-container ul):
(audio::-webkit-media-controls-closed-captions-container li):
(audio::-webkit-media-controls-closed-captions-container li:focus):
(audio::-webkit-media-controls-closed-captions-container li:hover):
Fix up some fonts to make fonts between captions, status display and time displays consistent.
(audio::-webkit-media-controls-status-display):
(audio::-webkit-media-controls-time-remaining-display):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181177 => 181178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 20:19:47 UTC (rev 181177)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 21:29:29 UTC (rev 181178)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-05 Roger Fong <roger_fong@apple.com>
+
+ Reskin Captions button and container on OSX.
+ https://bugs.webkit.org/show_bug.cgi?id=142383.
+ <rdar://problem/20061466>
+
+ Reviewed by Eric Carlson.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-toggle-closed-captions-button): Create new captions button icon.
+ Update caption container to match rest of media controls better.
+ (audio::-webkit-media-controls-closed-captions-container):
+ (audio::-webkit-media-controls-closed-captions-container .list):
+ (audio::-webkit-media-controls-closed-captions-container h3):
+ (audio::-webkit-media-controls-closed-captions-container ul):
+ (audio::-webkit-media-controls-closed-captions-container li):
+ (audio::-webkit-media-controls-closed-captions-container li:focus):
+ (audio::-webkit-media-controls-closed-captions-container li:hover):
+ Fix up some fonts to make fonts between captions, status display and time displays consistent.
+ (audio::-webkit-media-controls-status-display):
+ (audio::-webkit-media-controls-time-remaining-display):
+
</ins><span class="cx"> 2015-03-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web Audio] Decoding specific .m4a file crashes tab
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (181177 => 181178)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-06 20:19:47 UTC (rev 181177)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-03-06 21:29:29 UTC (rev 181178)
</span><span class="lines">@@ -229,9 +229,9 @@
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-toggle-closed-captions-button,
</span><span class="cx"> audio::-webkit-media-controls-toggle-closed-captions-button {
</span><del>- width: 15px;
</del><ins>+ width: 16px;
</ins><span class="cx"> margin-right: 16px;
</span><del>- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 102 105" fill="white"><path d="M98.766,43.224c0-23.163-21.775-41.94-48.637-41.94c-26.859,0-48.635,18.777-48.635,41.94c0,18.266,13.546,33.796,32.444,39.549c1.131,8.356,26.037,24.255,22.864,19.921c-4.462-6.096-5.159-13.183-5.07-17.566C77.85,84.397,98.766,65.923,98.766,43.224z" fill="url(#gradient)"/></svg>');
</del><ins>+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 15" stroke="white"><defs> <clipPath id="cut-hole"><rect x="0" y="0" width="16" height="10"/><rect x="0" y="10" width="9" height="1"/><rect x="11" y="10" width="5" height="1"/></clipPath></defs> <rect x="0.5" y="0.5" rx="1" ry="1" width="15" height="10" clip-path="url(#cut-hole)"/><path d="M 2,5.5 h 4"/><path d="M 7,5.5 h 7"/><path d="M 3,7.5 h 2"/><path d="M 6,7.5 h 3"/><path d="M 10,7.5 h 3"/><path d="M 8.5,10.5 L 8.5,12.75 L 11,10"/></svg>');
</ins><span class="cx"> outline: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -246,9 +246,9 @@
</span><span class="cx"> max-height: calc(100% - 39px); /* bottom + 10px */
</span><span class="cx"> overflow-x: hidden;
</span><span class="cx"> overflow-y: scroll;
</span><del>- background-color: rgba(0, 0, 0, 0.85);
- border: 3px solid rgba(128, 128, 128, 0.75);
- border-radius: 10px;
</del><ins>+ background-color: rgba(0, 0, 0, 0.8);
+ border: 1px solid rgba(128, 128, 128, 0.75);
+ border-radius: 6px;
</ins><span class="cx"> cursor: default;
</span><span class="cx"> z-index: 2;
</span><span class="cx"> text-align: initial;
</span><span class="lines">@@ -257,28 +257,26 @@
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container .list,
</span><span class="cx"> audio::-webkit-media-controls-closed-captions-container .list {
</span><span class="cx"> display: block;
</span><del>- font-family: "Helvetica Bold", Helvetica, sans-serif;
- font-size: 10pt;
</del><ins>+ font-family: "Helvetica Neue", Helvetica, sans-serif;
+ font-size: 11px;
</ins><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container h3,
</span><span class="cx"> audio::-webkit-media-controls-closed-captions-container h3 {
</span><span class="cx"> margin: 0;
</span><del>- color: rgb(117, 117, 117);
</del><ins>+ color: rgb(140, 140, 140);
</ins><span class="cx"> text-shadow: 0 1px 0 black;
</span><del>- -webkit-margin-start: 23px;
</del><ins>+ -webkit-margin-start: 16px;
</ins><span class="cx"> padding-top: 4px;
</span><del>- font-weight: bold;
- font-size: 10pt;
</del><ins>+ font-size: 11px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container ul,
</span><span class="cx"> audio::-webkit-media-controls-closed-captions-container ul {
</span><span class="cx"> list-style-type: none;
</span><del>- margin: 0 0 4px 0;
</del><ins>+ margin: 0 0 8px 0;
</ins><span class="cx"> padding: 0;
</span><del>- font-weight: bold;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container li,
</span><span class="lines">@@ -288,8 +286,8 @@
</span><span class="cx"> background-image: none;
</span><span class="cx"> text-shadow: 0 1px 0 black;
</span><span class="cx"> margin: 0;
</span><del>- padding-left: 37px;
- padding-right: 35px;
</del><ins>+ padding-left: 28px;
+ padding-right: 28px;
</ins><span class="cx"> padding-top: 0.15em;
</span><span class="cx"> padding-bottom: 0.2em;
</span><span class="cx"> box-sizing: border-box;
</span><span class="lines">@@ -303,14 +301,12 @@
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container li:focus,
</span><span class="cx"> audio::-webkit-media-controls-closed-captions-container li:focus {
</span><span class="cx"> outline: 0;
</span><del>- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(255, 255, 255, 0.3)), color-stop(1, rgba(255, 255, 255, 0.2)));
</del><ins>+ background-color: rgba(140, 140, 140, .5);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container li:hover,
</span><span class="cx"> audio::-webkit-media-controls-closed-captions-container li:hover {
</span><del>- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgb(79, 112, 246)), color-stop(1, rgb(26, 68, 243)));
- border-top: 1px solid rgb(70, 103, 234);
- border-bottom: 1px solid rgb(3, 54, 229);
</del><ins>+ background-color: rgba(26, 68, 243, 0.6);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-closed-captions-container li.selected::before,
</span><span class="lines">@@ -353,8 +349,8 @@
</span><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><del>- font: -webkit-small-control;
- font-size: 9px;
</del><ins>+ font-family: "Helvetica Neue", Helvetica, sans-serif;
+ font-size: 11px;
</ins><span class="cx"> overflow: hidden;
</span><span class="cx"> color: white;
</span><span class="cx"> text-shadow: black 0px 1px 1px;
</span><span class="lines">@@ -399,7 +395,7 @@
</span><span class="cx"> cursor: default;
</span><span class="cx"> overflow-y: hidden;
</span><span class="cx"> overflow-x: hidden;
</span><del>- font-family: 'Helvetica Neue';
</del><ins>+ font-family: "Helvetica Neue", Helvetica, sans-serif;
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> color: white;
</span><span class="cx"> text-shadow: black 0px 1px 1px;
</span></span></pre>
</div>
</div>
</body>
</html>