<!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>[279489] 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/279489">279489</a></dd>
<dt>Author</dt> <dd>amir_mark@apple.com</dd>
<dt>Date</dt> <dd>2021-07-01 17:22:27 -0700 (Thu, 01 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, reverting <a href="http://trac.webkit.org/projects/webkit/changeset/279481">r279481</a>.

Broke a pre-existing test

Reverted changeset:

"Move BottomControlsBarHeight and InsideMargin to be computed
at runtime"
https://bugs.webkit.org/show_bug.cgi?id=227505
https://commits.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/279481">r279481</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsinlinemediacontrolsjs">trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmodernmediacontrolscontrolslayoutnodejs">trunk/Source/WebCore/Modules/modern-media-controls/controls/layout-node.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="#trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss">trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279488 => 279489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-07-02 00:20:52 UTC (rev 279488)
+++ trunk/Source/WebCore/ChangeLog      2021-07-02 00:22:27 UTC (rev 279489)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-07-01  Amir Mark Jr  <amir_mark@apple.com>
+
+        Unreviewed, reverting r279481.
+
+        Broke a pre-existing test
+
+        Reverted changeset:
+
+        "Move BottomControlsBarHeight and InsideMargin to be computed
+        at runtime"
+        https://bugs.webkit.org/show_bug.cgi?id=227505
+        https://commits.webkit.org/r279481
+
</ins><span class="cx"> 2021-07-01  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebAudio auto-play policy should come from top document
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsinlinemediacontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js (279488 => 279489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js     2021-07-02 00:20:52 UTC (rev 279488)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js        2021-07-02 00:22:27 UTC (rev 279489)
</span><span class="lines">@@ -23,6 +23,9 @@
</span><span class="cx">  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><ins>+const InsideMargin = 6; // Minimum margin to guarantee around all controls, this constant needs to stay in sync with the --inline-controls-inside-margin CSS variable.
+const BottomControlsBarHeight = 31; // This constant needs to stay in sync with the --inline-controls-bar-height CSS variable.
+
</ins><span class="cx"> class InlineMediaControls extends MediaControls
</span><span class="cx"> {
</span><span class="cx"> 
</span><span class="lines">@@ -130,9 +133,7 @@
</span><span class="cx">         this.topLeftControlsBar.visible = this._topLeftControlsBarContainer.children.some(button => button.visible);
</span><span class="cx"> 
</span><span class="cx">         // Compute the visible size for the controls bar.
</span><del>-        if (!this._inlineInsideMargin)
-            this._inlineInsideMargin = this.computedValueForStylePropertyInPx("--inline-controls-inside-margin");
-        this.bottomControlsBar.width = this._shouldUseAudioLayout ? this.width : (this.width - 2 * this._inlineInsideMargin);
</del><ins>+        this.bottomControlsBar.width = this._shouldUseAudioLayout ? this.width : (this.width - 2 * InsideMargin);
</ins><span class="cx"> 
</span><span class="cx">         // Compute the absolute minimum width to display the center control (status label or time control).
</span><span class="cx">         const centerControl = this.statusLabel.enabled ? this.statusLabel : this.timeControl;
</span><span class="lines">@@ -217,9 +218,7 @@
</span><span class="cx"> 
</span><span class="cx">         // Ensure we position the bottom controls bar at the bottom of the frame, accounting for
</span><span class="cx">         // the inside margin, unless this would yield a position outside of the frame.
</span><del>-        if (!this._inlineBottomControlsBarHeight)
-            this._inlineBottomControlsBarHeight = this.computedValueForStylePropertyInPx("--inline-controls-bar-height");
-        this.bottomControlsBar.y = Math.max(0, this.height - this._inlineBottomControlsBarHeight - this._inlineInsideMargin);
</del><ins>+        this.bottomControlsBar.y = Math.max(0, this.height - BottomControlsBarHeight - InsideMargin);
</ins><span class="cx"> 
</span><span class="cx">         this.bottomControlsBar.children = controlsBarChildren;
</span><span class="cx">         if (!this._shouldUseAudioLayout && !this._shouldUseSingleBarLayout)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolslayoutnodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/layout-node.js (279488 => 279489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/layout-node.js       2021-07-02 00:20:52 UTC (rev 279488)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/layout-node.js  2021-07-02 00:22:27 UTC (rev 279489)
</span><span class="lines">@@ -229,21 +229,6 @@
</span><span class="cx">             this._updateDirtyState();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    computedValueForStyleProperty(propertyName)
-    {
-        return window.getComputedStyle(this.element).getPropertyValue(propertyName);
-    }
-
-    computedValueForStylePropertyInPx(propertyName)
-    {
-        const value = this.computedValueForStyleProperty(propertyName);
-        if (!value)
-            return 0;
-        if (!value.endsWith("px"))
-            return 0;
-        return parseFloat(value);
-    }
-
</del><span class="cx">     // Protected
</span><span class="cx"> 
</span><span class="cx">     layout()
</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 (279488 => 279489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js       2021-07-02 00:20:52 UTC (rev 279488)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js  2021-07-02 00:22:27 UTC (rev 279489)
</span><span class="lines">@@ -59,13 +59,8 @@
</span><span class="cx">         if (!this._volumeSliderContainer)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        if (!this._inlineInsideMargin)
-            this._inlineInsideMargin = this.computedValueForStylePropertyInPx("--inline-controls-inside-margin");
-        if (!this._inlineBottomControlsBarHeight)
-            this._inlineBottomControlsBarHeight = this.computedValueForStylePropertyInPx("--inline-controls-bar-height");
-
</del><span class="cx">         this._volumeSliderContainer.x = this.rightContainer.x + this.muteButton.x;
</span><del>-        this._volumeSliderContainer.y = this.bottomControlsBar.y - this._inlineBottomControlsBarHeight - this._inlineInsideMargin;
</del><ins>+        this._volumeSliderContainer.y = this.bottomControlsBar.y - BottomControlsBarHeight - InsideMargin;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     get preferredMuteButtonStyle()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmodernmediacontrolscontrolsmediacontrolscss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css (279488 => 279489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css   2021-07-02 00:20:52 UTC (rev 279488)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/media-controls.css      2021-07-02 00:22:27 UTC (rev 279489)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> * {
</span><ins>+    /* This constant needs to stay in sync with the InsideMargin JS constant. */
</ins><span class="cx">     --inline-controls-inside-margin: 6px;
</span><span class="cx">     --fullscreen-controls-bar-height: 75px;
</span><span class="cx">     --primary-glyph-color: rgba(255, 255, 255, 0.75);
</span><span class="lines">@@ -44,6 +45,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> :host(audio), :host(video.media-document.audio), * {
</span><ins>+    /* This constant needs to stay in sync with the BottomControlsBarHeight JS constant. */
</ins><span class="cx">     --inline-controls-bar-height: 31px;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>