<!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>[213113] 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/213113">213113</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 18:18:17 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Modern Media Controls] Adhere to tight padding on iOS
https://bugs.webkit.org/show_bug.cgi?id=168949
<rdar://problem/30746164>
Reviewed by Jon Lee.
Source/WebCore:
We used to only support custom margins on macOS, to support this on iOS as
well, we promote the notification when the layoutTraits property is set to
MediaControls and expose a new protected method layoutTraitsDidChange() for
subclasses to implement. IOSInlineMediaControls now implements that method
and will use tighter margins for the TightPadding layout trait.
Test: media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html
* Modules/modern-media-controls/controls/ios-inline-media-controls.js:
(IOSInlineMediaControls.prototype.layoutTraitsDidChange):
(IOSInlineMediaControls):
* Modules/modern-media-controls/controls/macos-inline-media-controls.js:
(MacOSInlineMediaControls.prototype.get layoutTraits): Deleted.
(MacOSInlineMediaControls.prototype.set layoutTraits): Deleted.
(MacOSInlineMediaControls.prototype._matchLayoutTraits): Deleted.
* Modules/modern-media-controls/controls/media-controls.js:
(MediaControls.prototype.get layoutTraits):
(MediaControls.prototype.set layoutTraits):
(MediaControls.prototype.layoutTraitsDidChange):
LayoutTests:
Adding a new test for the TightPadding layout trait on iOS.
* media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt: Added.
* media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsiosinlinemediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolstightpaddingexpectedtxt">trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolstightpaddinghtml">trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213112 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-28 02:08:25 UTC (rev 213112)
+++ trunk/LayoutTests/ChangeLog 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Adhere to tight padding on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=168949
+ <rdar://problem/30746164>
+
+ Reviewed by Jon Lee.
+
+ Adding a new test for the TightPadding layout trait on iOS.
+
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt: Added.
+ * media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html: Added.
+
</ins><span class="cx"> 2017-02-27 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark compositing/video/video-poster.html as flaky on macOS release.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolstightpaddingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt (0 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding-expected.txt 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+Testing IOSInlineMediaControls with tight padding.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS mediaControls.leftContainer.leftMargin is 12
+PASS mediaControls.leftContainer.rightMargin is 12
+PASS mediaControls.leftContainer.buttonMargin is 12
+PASS mediaControls.rightContainer.leftMargin is 12
+PASS mediaControls.rightContainer.rightMargin is 12
+PASS mediaControls.rightContainer.buttonMargin is 12
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsiosinlinemediacontrolsiosinlinemediacontrolstightpaddinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html (0 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
+<body>
+<script type="text/javascript">
+
+description("Testing <code>IOSInlineMediaControls</code> with tight padding.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 400 });
+mediaControls.layoutTraits = LayoutTraits.iOS | LayoutTraits.TightPadding;
+
+shouldBe("mediaControls.leftContainer.leftMargin", "12");
+shouldBe("mediaControls.leftContainer.rightMargin", "12");
+shouldBe("mediaControls.leftContainer.buttonMargin", "12");
+shouldBe("mediaControls.rightContainer.leftMargin", "12");
+shouldBe("mediaControls.rightContainer.rightMargin", "12");
+shouldBe("mediaControls.rightContainer.buttonMargin ", "12");
+debug("");
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213112 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-28 02:08:25 UTC (rev 213112)
+++ trunk/Source/WebCore/ChangeLog 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-02-27 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Adhere to tight padding on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=168949
+ <rdar://problem/30746164>
+
+ Reviewed by Jon Lee.
+
+ We used to only support custom margins on macOS, to support this on iOS as
+ well, we promote the notification when the layoutTraits property is set to
+ MediaControls and expose a new protected method layoutTraitsDidChange() for
+ subclasses to implement. IOSInlineMediaControls now implements that method
+ and will use tighter margins for the TightPadding layout trait.
+
+ Test: media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html
+
+ * Modules/modern-media-controls/controls/ios-inline-media-controls.js:
+ (IOSInlineMediaControls.prototype.layoutTraitsDidChange):
+ (IOSInlineMediaControls):
+ * Modules/modern-media-controls/controls/macos-inline-media-controls.js:
+ (MacOSInlineMediaControls.prototype.get layoutTraits): Deleted.
+ (MacOSInlineMediaControls.prototype.set layoutTraits): Deleted.
+ (MacOSInlineMediaControls.prototype._matchLayoutTraits): Deleted.
+ * Modules/modern-media-controls/controls/media-controls.js:
+ (MediaControls.prototype.get layoutTraits):
+ (MediaControls.prototype.set layoutTraits):
+ (MediaControls.prototype.layoutTraitsDidChange):
+
</ins><span class="cx"> 2017-02-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC] Support modern RTCStatsReport
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsiosinlinemediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js (213112 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js 2017-02-28 02:08:25 UTC (rev 213112)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/ios-inline-media-controls.js 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> cssClassName: "right"
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ this.layoutTraitsDidChange();
+
</ins><span class="cx"> this.controlsBar.children = [this.leftContainer, this.rightContainer];
</span><span class="cx">
</span><span class="cx"> this._pinchGestureRecognizer = new PinchGestureRecognizer(this.element, this);
</span><span class="lines">@@ -66,7 +68,7 @@
</span><span class="cx"> this.delegate.iOSInlineMediaControlsRecognizedPinchInGesture();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Public
</del><ins>+ // Protected
</ins><span class="cx">
</span><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="lines">@@ -76,6 +78,20 @@
</span><span class="cx"> this.controlsBar.children = this._inlineLayoutSupport.childrenAfterPerformingLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ layoutTraitsDidChange()
+ {
+ if (!this.leftContainer || !this.rightContainer)
+ return;
+
+ const margin = (this.layoutTraits & LayoutTraits.TightPadding) ? 12 : 24;
+ this.leftContainer.leftMargin = margin;
+ this.leftContainer.rightMargin = margin;
+ this.leftContainer.buttonMargin = margin;
+ this.rightContainer.leftMargin = margin;
+ this.rightContainer.rightMargin = margin;
+ this.rightContainer.buttonMargin = margin;
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IOSInlineMediaControls.MinimumScaleToEnterFullscreen = 1.5;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmacosinlinemediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js (213112 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-02-28 02:08:25 UTC (rev 213112)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> cssClassName: "right"
</span><span class="cx"> });
</span><span class="cx">
</span><del>- this._matchLayoutTraits();
</del><ins>+ this.layoutTraitsDidChange();
</ins><span class="cx">
</span><span class="cx"> this._backgroundTint = new BackgroundTint;
</span><span class="cx">
</span><span class="lines">@@ -62,20 +62,6 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get layoutTraits()
- {
- return this._layoutTraits;
- }
-
- set layoutTraits(layoutTraits)
- {
- if (this._layoutTraits === layoutTraits)
- return;
-
- this._layoutTraits = layoutTraits;
- this._matchLayoutTraits();
- }
-
</del><span class="cx"> layout()
</span><span class="cx"> {
</span><span class="cx"> super.layout();
</span><span class="lines">@@ -116,9 +102,7 @@
</span><span class="cx"> this.layout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Private
-
- _matchLayoutTraits()
</del><ins>+ layoutTraitsDidChange()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.leftContainer || !this.rightContainer)
</span><span class="cx"> return;
</span><span class="lines">@@ -164,4 +148,5 @@
</span><span class="cx">
</span><span class="cx"> this.element.classList.toggle("compact", layoutTraits & LayoutTraits.Compact);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (213112 => 213113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-02-28 02:08:25 UTC (rev 213112)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js 2017-02-28 02:18:17 UTC (rev 213113)
</span><span class="lines">@@ -59,6 +59,20 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ get layoutTraits()
+ {
+ return this._layoutTraits;
+ }
+
+ set layoutTraits(layoutTraits)
+ {
+ if (this._layoutTraits === layoutTraits)
+ return;
+
+ this._layoutTraits = layoutTraits;
+ this.layoutTraitsDidChange();
+ }
+
</ins><span class="cx"> get showsStartButton()
</span><span class="cx"> {
</span><span class="cx"> return !!this._showsStartButton;
</span><span class="lines">@@ -156,6 +170,11 @@
</span><span class="cx"> // Implemented by subclasses as needed.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ layoutTraitsDidChange()
+ {
+ // Implemented by subclasses as needed.
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _invalidateChildren()
</span></span></pre>
</div>
</div>
</body>
</html>