<!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>[171597] tags/Safari-600.1.3</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/171597">171597</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-25 08:33:58 -0700 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171593">r171593</a>. <rdar://problem/16878037></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60013LayoutTestsChangeLog">tags/Safari-600.1.3/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacfastlayersvideolayerexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-after-reload-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediacontrolsstrictexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-strict-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediacontrolswithoutpreloadexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-without-preload-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediamediacontrolscloneexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/media-controls-clone-expected.txt</a></li>
<li><a href="#tagsSafari60013LayoutTestsplatformmacmediavideonoaudioexpectedtxt">tags/Safari-600.1.3/LayoutTests/platform/mac/media/video-no-audio-expected.txt</a></li>
<li><a href="#tagsSafari60013SourceWebCoreChangeLog">tags/Safari-600.1.3/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsApplecss">tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsApplejs">tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsiOScss">tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
<li><a href="#tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsiOSjs">tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60013LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/ChangeLog (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/ChangeLog 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/ChangeLog 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-07-25 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171593
+
+ 2014-07-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: iOS video playback controls look blurry.
+ https://bugs.webkit.org/show_bug.cgi?id=135245
+ <rdar://problem/16878037>
+
+ Reviewed by Simon Fraser.
+
+ This patch introduces a compositing parent of the overlay control panel so that
+ the transformed overlay panel becomes sharp. This is a workaround for webkit.org/b/135246.
+
+ Can't find a way to test it yet.
+
+ * platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt:
+ * platform/mac/fast/layers/video-layer-expected.txt:
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/controls-strict-expected.txt:
+ * platform/mac/media/controls-without-preload-expected.txt:
+ * platform/mac/media/media-controls-clone-expected.txt:
+ * platform/mac/media/video-no-audio-expected.txt:
+
</ins><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171567
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -13,7 +13,9 @@
</span><span class="cx"> layer at (8,26) size 300x150
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x150
</span><span class="cx"> layer at (8,151) size 300x25
</span><del>- RenderFlexibleBox {DIV} at (0,125) size 300x25
</del><ins>+ RenderBlock {DIV} at (0,125) size 300x25
+layer at (8,151) size 300x25
+ RenderFlexibleBox {DIV} at (0,0) size 300x25
</ins><span class="cx"> layer at (14,156) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,156) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacfastlayersvideolayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -18,7 +18,9 @@
</span><span class="cx"> layer at (59,111) size 300x150
</span><span class="cx"> RenderFlexibleBox {DIV} at (1,1) size 300x150
</span><span class="cx"> layer at (59,236) size 300x25
</span><del>- RenderFlexibleBox {DIV} at (0,125) size 300x25
</del><ins>+ RenderBlock {DIV} at (0,125) size 300x25
+layer at (59,236) size 300x25
+ RenderFlexibleBox {DIV} at (0,0) size 300x25
</ins><span class="cx"> layer at (65,241) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (91,241) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> RenderBR {BR} at (0,86) size 0x18
</span><span class="cx"> layer at (8,42) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><ins>+ RenderBlock {DIV} at (0,0) size 200x25
</ins><span class="cx"> layer at (8,42) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><span class="cx"> layer at (14,47) size 16x16
</span><span class="lines">@@ -54,6 +55,7 @@
</span><span class="cx"> RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
</span><span class="cx"> layer at (8,85) size 320x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x25
</span><ins>+ RenderBlock {DIV} at (0,0) size 320x25
</ins><span class="cx"> layer at (8,85) size 320x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x25
</span><span class="cx"> layer at (14,90) size 16x16
</span><span class="lines">@@ -94,8 +96,9 @@
</span><span class="cx"> RenderMedia {AUDIO} at (8,128) size 320x100 [bgcolor=#0000FF]
</span><span class="cx"> layer at (8,128) size 320x100
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x100
</span><ins>+ RenderBlock {DIV} at (0,75) size 320x25
</ins><span class="cx"> layer at (8,203) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,75) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,0) size 320x25
</ins><span class="cx"> layer at (14,208) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,208) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -13,7 +13,9 @@
</span><span class="cx"> layer at (8,42) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,257) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,215) size 320x25
</del><ins>+ RenderBlock {DIV} at (0,215) size 320x25
+layer at (8,257) size 320x25
+ RenderFlexibleBox {DIV} at (0,0) size 320x25
</ins><span class="cx"> layer at (14,262) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,262) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediacontrolsstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-strict-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-strict-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-strict-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -13,7 +13,9 @@
</span><span class="cx"> layer at (8,50) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,265) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,215) size 320x25
</del><ins>+ RenderBlock {DIV} at (0,215) size 320x25
+layer at (8,265) size 320x25
+ RenderFlexibleBox {DIV} at (0,0) size 320x25
</ins><span class="cx"> layer at (14,270) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,270) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediacontrolswithoutpreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-without-preload-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -13,7 +13,9 @@
</span><span class="cx"> layer at (8,42) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,257) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,215) size 320x25
</del><ins>+ RenderBlock {DIV} at (0,215) size 320x25
+layer at (8,257) size 320x25
+ RenderFlexibleBox {DIV} at (0,0) size 320x25
</ins><span class="cx"> layer at (14,262) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,262) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediamediacontrolscloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> layer at (8,8) size 300x150
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x150
</span><span class="cx"> layer at (8,133) size 300x25
</span><del>- RenderFlexibleBox {DIV} at (0,125) size 300x25
</del><ins>+ RenderBlock {DIV} at (0,125) size 300x25
+layer at (8,133) size 300x25
+ RenderFlexibleBox {DIV} at (0,0) size 300x25
</ins><span class="cx"> layer at (14,138) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,138) size 16x16
</span><span class="lines">@@ -25,6 +27,7 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (2,0) size 110x9
</span><span class="cx"> layer at (308,133) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><ins>+ RenderBlock {DIV} at (0,0) size 200x25
</ins><span class="cx"> layer at (308,133) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><span class="cx"> layer at (314,138) size 16x16
</span><span class="lines">@@ -38,7 +41,9 @@
</span><span class="cx"> layer at (8,162) size 300x150
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 300x150
</span><span class="cx"> layer at (8,287) size 300x25
</span><del>- RenderFlexibleBox {DIV} at (0,125) size 300x25
</del><ins>+ RenderBlock {DIV} at (0,125) size 300x25
+layer at (8,287) size 300x25
+ RenderFlexibleBox {DIV} at (0,0) size 300x25
</ins><span class="cx"> layer at (14,292) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,292) size 16x16
</span><span class="lines">@@ -49,6 +54,7 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (2,0) size 110x9
</span><span class="cx"> layer at (308,287) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><ins>+ RenderBlock {DIV} at (0,0) size 200x25
</ins><span class="cx"> layer at (308,287) size 200x25
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 200x25
</span><span class="cx"> layer at (314,292) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013LayoutTestsplatformmacmediavideonoaudioexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/LayoutTests/platform/mac/media/video-no-audio-expected.txt (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -13,7 +13,9 @@
</span><span class="cx"> layer at (8,42) size 352x288
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 352x288
</span><span class="cx"> layer at (8,305) size 352x25
</span><del>- RenderFlexibleBox {DIV} at (0,263) size 352x25
</del><ins>+ RenderBlock {DIV} at (0,263) size 352x25
+layer at (8,305) size 352x25
+ RenderFlexibleBox {DIV} at (0,0) size 352x25
</ins><span class="cx"> layer at (14,310) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,310) size 16x16
</span></span></pre></div>
<a id="tagsSafari60013SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/Source/WebCore/ChangeLog (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/Source/WebCore/ChangeLog 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/Source/WebCore/ChangeLog 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-07-25 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171593
+
+ 2014-07-25 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: iOS video playback controls look blurry.
+ https://bugs.webkit.org/show_bug.cgi?id=135245
+ <rdar://problem/16878037>
+
+ Reviewed by Simon Fraser.
+
+ This patch introduces a compositing parent of the overlay control panel so that
+ the transformed overlay panel becomes sharp. This is a workaround for webkit.org/b/135246.
+
+ Can't find a way to test it yet.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (video::-webkit-media-controls-panel-composited-parent):
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls):
+ (Controller.prototype.addControls):
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (video::-webkit-media-controls-panel-composited-parent):
+ * Modules/mediacontrols/mediaControlsiOS.js: This is a workaround for webkit.org/b/135248
+ It pushes the overlay panel down to close the gap with the video element. Since the
+ panel's size in css pixels is scale dependent, the gap needs to be scale dependent too.
+ (ControllerIOS.prototype.set pageScaleFactor):
+
</ins><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171203
</span></span></pre></div>
<a id="tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -64,6 +64,11 @@
</span><span class="cx"> -webkit-flex: 1 1 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-panel-composited-parent {
+ -webkit-transform: translateZ(0);
+ width: 100%;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-panel,
</span><span class="cx"> audio::-webkit-media-controls-panel {
</span><span class="cx"> box-sizing: border-box;
</span></span></pre></div>
<a id="tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -285,6 +285,9 @@
</span><span class="cx">
</span><span class="cx"> createControls: function()
</span><span class="cx"> {
</span><ins>+ var panelCompositedParent = this.controls.panelCompositedParent = document.createElement('div');
+ panelCompositedParent.setAttribute('pseudo', '-webkit-media-controls-panel-composited-parent');
+
</ins><span class="cx"> var panel = this.controls.panel = document.createElement('div');
</span><span class="cx"> panel.setAttribute('pseudo', '-webkit-media-controls-panel');
</span><span class="cx"> panel.setAttribute('aria-label', (this.isAudio() ? this.UIString('Audio Playback') : this.UIString('Video Playback')));
</span><span class="lines">@@ -1026,7 +1029,8 @@
</span><span class="cx">
</span><span class="cx"> addControls: function()
</span><span class="cx"> {
</span><del>- this.base.appendChild(this.controls.panel);
</del><ins>+ this.base.appendChild(this.controls.panelCompositedParent);
+ this.controls.panelCompositedParent.appendChild(this.controls.panel);
</ins><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -114,6 +114,11 @@
</span><span class="cx"> -webkit-flex: 1 1 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-panel-composited-parent {
+ -webkit-transform: translateZ(0);
+ width: 100%;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-panel,
</span><span class="cx"> video::-webkit-media-controls-panel {
</span><span class="cx"> box-sizing: border-box;
</span></span></pre></div>
<a id="tagsSafari60013SourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (171596 => 171597)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-07-25 15:32:19 UTC (rev 171596)
+++ tags/Safari-600.1.3/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-07-25 15:33:58 UTC (rev 171597)
</span><span class="lines">@@ -456,11 +456,15 @@
</span><span class="cx"> this._pageScaleFactor = newScaleFactor;
</span><span class="cx">
</span><span class="cx"> if (newScaleFactor) {
</span><del>- var scaleTransform = "scale(" + (1 / newScaleFactor) + ")";
</del><ins>+ var scaleValue = 1 / newScaleFactor;
+ var scaleTransform = "scale(" + scaleValue + ")";
</ins><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>- this.controls.panel.style.width = (newScaleFactor * 100) + "%";
</del><ins>+ 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.ceil(newScaleFactor * 100) + "%";
</ins><span class="cx"> this.controls.panel.style.webkitTransform = scaleTransform;
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> this.updateProgress();
</span></span></pre>
</div>
</div>
</body>
</html>