<!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>[209520] trunk</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/209520">209520</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 20:46:13 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Use a small picture-in-picture button in fullscreen
https://bugs.webkit.org/show_bug.cgi?id=165587
Patch by Antoine Quint <graouts@apple.com> on 2016-12-07
Reviewed by Dean Jackson.
Source/WebCore:
Use a newer, smaller asset for picture-in-picture in fullscreen.
* Modules/modern-media-controls/controls/icon-service.js:
* Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png: Added.
* Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png: Added.
LayoutTests:
Rebaseline tests to account for the smaller picture-in-picture button in fullscreen.
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstylesexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstyleshtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstylesexpectedtxt">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstyleshtml">trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs">trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen1xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen2xpng">trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-12-07 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Use a small picture-in-picture button in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165587
+
+ Reviewed by Dean Jackson.
+
+ Rebaseline tests to account for the smaller picture-in-picture button in fullscreen.
+
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
+
</ins><span class="cx"> 2016-12-07 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking inspector/debugger/async-stack-trace.html as flaky on macOS.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -8,9 +8,9 @@
</span><span class="cx"> PASS centerContainerBounds.width is 178
</span><span class="cx"> PASS centerContainerBounds.height is 44
</span><span class="cx">
</span><del>-PASS rightContainerBounds.left is within 0.5 of 488
</del><ins>+PASS rightContainerBounds.left is within 0.5 of 493
</ins><span class="cx"> PASS rightContainerBounds.top is 500
</span><del>-PASS rightContainerBounds.width is within 0.5 of 146
</del><ins>+PASS rightContainerBounds.width is within 0.5 of 141
</ins><span class="cx"> PASS rightContainerBounds.height is 44
</span><span class="cx">
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonscontainersstyleshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -41,9 +41,9 @@
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> rightContainerBounds = rightContainer.element.getBoundingClientRect();
</span><del>- shouldBeCloseTo("rightContainerBounds.left", 488, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.left", 493, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.top", "500");
</span><del>- shouldBeCloseTo("rightContainerBounds.width", 146, 0.5);
</del><ins>+ shouldBeCloseTo("rightContainerBounds.width", 141, 0.5);
</ins><span class="cx"> shouldBe("rightContainerBounds.height", "44");
</span><span class="cx">
</span><span class="cx"> mediaControls.element.remove();
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstylesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><span class="cx"> TracksButton
</span><del>-PASS style.left is "87px"
</del><ins>+PASS style.left is "82px"
</ins><span class="cx"> PASS style.webkitMaskPositionY is "15px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span><span class="cx"> FullscreenButton
</span><del>-PASS style.left is "119px"
</del><ins>+PASS style.left is "114px"
</ins><span class="cx"> PASS style.webkitMaskPositionY is "13px"
</span><span class="cx"> PASS style.height is "44px"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsmacosfullscreenmediacontrolsmacosfullscreenmediacontrolsbuttonsstyleshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> [mediaControls.forwardButton, 127, 16],
</span><span class="cx"> [mediaControls.airplayButton, 12, 13],
</span><span class="cx"> [mediaControls.pipButton, 44, 13],
</span><del>- [mediaControls.tracksButton, 87, 15],
- [mediaControls.fullscreenButton, 119, 13]
</del><ins>+ [mediaControls.tracksButton, 82, 15],
+ [mediaControls.fullscreenButton, 114, 13]
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> let style;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-07 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Use a small picture-in-picture button in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165587
+
+ Reviewed by Dean Jackson.
+
+ Use a newer, smaller asset for picture-in-picture in fullscreen.
+
+ * Modules/modern-media-controls/controls/icon-service.js:
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png: Added.
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png: Added.
+
</ins><span class="cx"> 2016-12-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove runtime toggle for pointer-lock
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiconservicejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js (209519 => 209520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-12-08 04:46:13 UTC (rev 209520)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> VolumeMuted : "volume-mute"
</span><span class="cx"> };
</span><span class="cx">
</span><del>-const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.Play];
</del><ins>+const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.EnterPiP, Icons.Play];
</ins><span class="cx">
</span><span class="cx"> const iconService = new class IconService {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen1xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png 2016-12-08 04:27:19 UTC (rev 209519)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png 2016-12-08 04:46:13 UTC (rev 209520)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@1x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreModulesmodernmediacontrolsimagesmacOSpipinfullscreen2xpng"></a>
<div class="binary"><h4>Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png
</span><span class="cx">===================================================================
</span><del>--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png 2016-12-08 04:27:19 UTC (rev 209519)
</del><ins>+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png 2016-12-08 04:46:13 UTC (rev 209520)
</ins><span class="cx">Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscreen@2x.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+image/png
</ins><span class="cx">\ No newline at end of property
</span></div>
</body>
</html>