<!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>[187423] 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/187423">187423</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 00:03:21 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187366">r187366</a>. rdar://problem/21429111</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</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 (187422 => 187423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:02:26 UTC (rev 187422)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-27 07:03:21 UTC (rev 187423)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-07-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187366.
+
+ 2015-07-24 Zalan Bujtas <zalan@apple.com>
+
+ [iOS]: Inline video controls are blurry on scaled-down pages on non-retina devices.
+ https://bugs.webkit.org/show_bug.cgi?id=147272
+ rdar://problem/21429111
+
+ Reviewed by Simon Fraser.
+
+ Blurry inline video controls are the result of transform scaling up the content when the page
+ is zoomed out (page scale > 1).
+ This patch addresses the blurriness by switching to css zoom when the content is being scaled up.
+ While transform scale is a paint time operation, css zoom triggers layout and the content is getting
+ painted on a non-scaled graphics context.
+
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-controls-timeline-container):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.set pageScaleFactor):
+
+2015-07-27 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187358.
</span><span class="cx">
</span><span class="cx"> 2015-07-24 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (187422 => 187423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-27 07:02:26 UTC (rev 187422)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-27 07:03:21 UTC (rev 187423)
</span><span class="lines">@@ -478,6 +478,7 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> padding: 0;
</span><span class="cx"> -webkit-order: 2;
</span><ins>+ -webkit-text-size-adjust: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-timeline-container {
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (187422 => 187423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-27 07:02:26 UTC (rev 187422)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-27 07:03:21 UTC (rev 187423)
</span><span class="lines">@@ -674,12 +674,20 @@
</span><span class="cx"> if (this.controls.startPlaybackButton)
</span><span class="cx"> this.controls.startPlaybackButton.style.webkitTransform = scaleTransform;
</span><span class="cx"> if (this.controls.panel) {
</span><del>- var bottomAligment = -2 * scaleValue;
- this.controls.panel.style.bottom = bottomAligment + "px";
- this.controls.panel.style.paddingBottom = -(newScaleFactor * bottomAligment) + "px";
- this.controls.panel.style.width = Math.round(newScaleFactor * 100) + "%";
- this.controls.panel.style.webkitTransform = scaleTransform;
-
</del><ins>+ if (scaleValue > 1) {
+ this.controls.panel.style.width = "100%";
+ this.controls.panel.style.zoom = scaleValue;
+ this.controls.panel.style.webkitTransform = "scale(1)";
+ this.controls.timelineBox.style.webkitTextSizeAdjust = (100 * scaleValue) + "%";
+ } else {
+ var bottomAligment = -2 * scaleValue;
+ this.controls.panel.style.bottom = bottomAligment + "px";
+ this.controls.panel.style.paddingBottom = -(newScaleFactor * bottomAligment) + "px";
+ this.controls.panel.style.width = Math.round(newScaleFactor * 100) + "%";
+ this.controls.panel.style.webkitTransform = scaleTransform;
+ this.controls.timelineBox.style.webkitTextSizeAdjust = "auto";
+ this.controls.panel.style.zoom = 1;
+ }
</ins><span class="cx"> this.controls.panelBackground.style.height = (50 * scaleValue) + "px";
</span><span class="cx">
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span></span></pre>
</div>
</div>
</body>
</html>