<!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>[176067] branches/safari-600.3-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/176067">176067</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-11-12 23:36:20 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175268">r175268</a>. rdar://problems/18883890</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss">branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176066 => 176067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 07:07:16 UTC (rev 176066)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 07:36:20 UTC (rev 176067)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-10-28 Jer Noble <jer.noble@apple.com>
+
+ REGRESSION(r171593) [Mac] Media controls create a large (and unnecessary) backing store
+ https://bugs.webkit.org/show_bug.cgi?id=137757
+
+ Reviewed by Eric Carlson.
+
+ In r171593, a <div> was added to the media controls which is only ever used on iOS. Instead
+ of creating and adding this <div> in mediaControlsApple.js (which is used on OS X), this
+ <div> should be created and added in mediaControlsiOS.js, which requires overloading
+ Controller.addControls.
+
+ * Modules/mediacontrols/mediaControlsApple.css:
+ (audio::-webkit-media-controls-panel.hidden): Drive-by fix: allow the panel itself to be hidden.
+ (video::-webkit-media-controls-panel-composited-parent): Deleted.
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls): Remove the composited parent.
+ (Controller.prototype.addControls): Ditto.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.createControls): Create the composited parent.
+ (ControllerIOS.prototype.addControls): Copied from (previous) apple.js.
+
</ins><span class="cx"> 2014-11-12 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Speculative build fix.
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (176066 => 176067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-11-13 07:07:16 UTC (rev 176066)
+++ branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-11-13 07:36:20 UTC (rev 176067)
</span><span class="lines">@@ -64,11 +64,6 @@
</span><span class="cx"> -webkit-flex: 1 1 auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-panel-composited-parent {
- -webkit-transform: translateZ(0);
- width: 100%;
-}
-
</del><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 class="lines">@@ -536,6 +531,11 @@
</span><span class="cx"> opacity: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-panel.hidden,
+audio::-webkit-media-controls-panel.hidden {
+ display: none;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-panel .hidden,
</span><span class="cx"> audio::-webkit-media-controls-panel .hidden {
</span><span class="cx"> display: none;
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (176066 => 176067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-13 07:07:16 UTC (rev 176066)
+++ branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-13 07:36:20 UTC (rev 176067)
</span><span class="lines">@@ -285,9 +285,6 @@
</span><span class="cx">
</span><span class="cx"> createControls: function()
</span><span class="cx"> {
</span><del>- var panelCompositedParent = this.controls.panelCompositedParent = document.createElement('div');
- panelCompositedParent.setAttribute('pseudo', '-webkit-media-controls-panel-composited-parent');
-
</del><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">@@ -1036,8 +1033,7 @@
</span><span class="cx">
</span><span class="cx"> addControls: function()
</span><span class="cx"> {
</span><del>- this.base.appendChild(this.controls.panelCompositedParent);
- this.controls.panelCompositedParent.appendChild(this.controls.panel);
</del><ins>+ this.base.appendChild(this.controls.panel);
</ins><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (176066 => 176067)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-13 07:07:16 UTC (rev 176066)
+++ branches/safari-600.3-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-13 07:36:20 UTC (rev 176067)
</span><span class="lines">@@ -141,6 +141,9 @@
</span><span class="cx"> createControls: function() {
</span><span class="cx"> Controller.prototype.createControls.call(this);
</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 wirelessPlaybackStatus = this.controls.wirelessPlaybackStatus = document.createElement('div');
</span><span class="cx"> wirelessPlaybackStatus.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-status');
</span><span class="cx"> wirelessPlaybackStatus.classList.add(this.ClassNames.hidden);
</span><span class="lines">@@ -211,6 +214,12 @@
</span><span class="cx"> // Do nothing
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ addControls: function() {
+ this.base.appendChild(this.controls.panelCompositedParent);
+ this.controls.panelCompositedParent.appendChild(this.controls.panel);
+ this.setNeedsTimelineMetricsUpdate();
+ },
+
</ins><span class="cx"> updateControls: function() {
</span><span class="cx"> if (this.shouldHaveStartPlaybackButton())
</span><span class="cx"> this.setControlsType(ControllerIOS.StartPlaybackControls);
</span></span></pre>
</div>
</div>
</body>
</html>