<!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>[181899] 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/181899">181899</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-03-24 12:53:17 -0700 (Tue, 24 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>MediaControls: Scrubber and Time displays have the incorrect blending
https://bugs.webkit.org/show_bug.cgi?id=143011
<rdar://problem/20245251>
Reviewed by Eric Carlson.
The scrubber in media controls should use plus-darker blending. Then
the scrubber itself should use a slightly transparent black (55% opacity)
when drawing.
* Modules/mediacontrols/mediaControlsiOS.css:
(audio::-webkit-media-controls-timeline): Add the blend mode.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.drawTimelineBackground): Start drawing with
transparency. I changed the order of rendering to make it
more clear we draw the three parts in left to right order.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181898 => 181899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-24 19:13:06 UTC (rev 181898)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 19:53:17 UTC (rev 181899)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-03-24 Dean Jackson <dino@apple.com>
+
+ MediaControls: Scrubber and Time displays have the incorrect blending
+ https://bugs.webkit.org/show_bug.cgi?id=143011
+ <rdar://problem/20245251>
+
+ Reviewed by Eric Carlson.
+
+ The scrubber in media controls should use plus-darker blending. Then
+ the scrubber itself should use a slightly transparent black (55% opacity)
+ when drawing.
+
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-controls-timeline): Add the blend mode.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.drawTimelineBackground): Start drawing with
+ transparency. I changed the order of rendering to make it
+ more clear we draw the three parts in left to right order.
+
</ins><span class="cx"> 2015-03-24 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve the offsetWidth/Height layout optimization
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (181898 => 181899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-24 19:13:06 UTC (rev 181898)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-24 19:53:17 UTC (rev 181899)
</span><span class="lines">@@ -361,6 +361,7 @@
</span><span class="cx"> border-radius: 0 !important;
</span><span class="cx"> box-sizing: content-box !important;
</span><span class="cx"> -webkit-transform: translate3d(0, 0, 0);
</span><ins>+ mix-blend-mode: plus-darker;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-timeline::-webkit-slider-runnable-track,
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (181898 => 181899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-24 19:13:06 UTC (rev 181898)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-24 19:53:17 UTC (rev 181899)
</span><span class="lines">@@ -247,31 +247,31 @@
</span><span class="cx">
</span><span class="cx"> var midY = height / 2;
</span><span class="cx">
</span><del>- // 1. Draw the outline with a clip path that subtracts the
- // middle of a lozenge. This produces a better result than
- // stroking when we come to filling the parts below.
</del><ins>+ // 1. Draw the buffered part and played parts, using
+ // solid rectangles that are clipped to the outside of
+ // the lozenge.
</ins><span class="cx"> ctx.save();
</span><span class="cx"> ctx.beginPath();
</span><span class="cx"> this.addRoundedRect(ctx, 1, midY - 3, width - 2, 6, 3);
</span><del>- this.addRoundedRect(ctx, 2, midY - 2, width - 4, 4, 2);
</del><span class="cx"> ctx.closePath();
</span><del>- ctx.clip("evenodd");
- ctx.fillStyle = "black";
- ctx.fillRect(0, 0, width, height);
</del><ins>+ ctx.clip();
+ ctx.fillStyle = "white";
+ ctx.fillRect(0, 0, Math.round(width * played) + 2, height);
+ ctx.fillStyle = "rgba(0, 0, 0, 0.55)";
+ ctx.fillRect(Math.round(width * played) + 2, 0, Math.round(width * (buffered - played)) + 2, height);
</ins><span class="cx"> ctx.restore();
</span><span class="cx">
</span><del>- // 2. Draw the buffered part and played parts, using
- // solid rectangles that are clipped to the outside of
- // the lozenge.
</del><ins>+ // 2. Draw the outline with a clip path that subtracts the
+ // middle of a lozenge. This produces a better result than
+ // stroking.
</ins><span class="cx"> ctx.save();
</span><span class="cx"> ctx.beginPath();
</span><span class="cx"> this.addRoundedRect(ctx, 1, midY - 3, width - 2, 6, 3);
</span><ins>+ this.addRoundedRect(ctx, 2, midY - 2, width - 4, 4, 2);
</ins><span class="cx"> ctx.closePath();
</span><del>- ctx.clip();
- ctx.fillStyle = "black";
- ctx.fillRect(0, 0, Math.round(width * buffered) + 2, height);
- ctx.fillStyle = "white";
- ctx.fillRect(0, 0, Math.round(width * played) + 2, height);
</del><ins>+ ctx.clip("evenodd");
+ ctx.fillStyle = "rgba(0, 0, 0, 0.55)";
+ ctx.fillRect(Math.round(width * buffered) + 2, 0, width, height);
</ins><span class="cx"> ctx.restore();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>