<!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>[175268] 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/175268">175268</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 12:37:22 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/171593">r171593</a>) [Mac] Media controls create a large (and unnecessary) backing store
https://bugs.webkit.org/show_bug.cgi?id=137757
Reviewed by Eric Carlson.
Source/WebCore:
In <a href="http://trac.webkit.org/projects/webkit/changeset/171593">r171593</a>, 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.
LayoutTests:
* platform/mac-mavericks/media/audio-controls-rendering-expected.png:
* platform/mac-mavericks/media/audio-controls-rendering-expected.txt:
* platform/mac-mavericks/media/controls-strict-expected.txt:
* platform/mac-mavericks/media/controls-without-preload-expected.txt: Copied from LayoutTests/platform/mac/media/controls-without-preload-expected.txt.
* platform/mac-mavericks/media/video-controls-rendering-expected.txt:
* platform/mac-mavericks/media/video-display-toggle-expected.txt:
* platform/mac-mavericks/media/video-empty-source-expected.txt: Copied from LayoutTests/platform/mac/media/video-empty-source-expected.txt.
* platform/mac-mavericks/media/video-no-audio-expected.png:
* platform/mac-mavericks/media/video-no-audio-expected.txt:
* platform/mac-mavericks/media/video-volume-slider-expected.txt:
* platform/mac-mavericks/media/video-zoom-controls-expected.png:
* platform/mac-mavericks/media/video-zoom-controls-expected.txt:
* 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.png:
* platform/mac/media/audio-controls-rendering-expected.txt:
* platform/mac/media/controls-after-reload-expected.png:
* platform/mac/media/controls-after-reload-expected.txt:
* platform/mac/media/controls-strict-expected.png:
* platform/mac/media/controls-strict-expected.txt:
* platform/mac/media/controls-without-preload-expected.png:
* platform/mac/media/controls-without-preload-expected.txt:
* platform/mac/media/media-controls-clone-expected.png:
* platform/mac/media/media-controls-clone-expected.txt:
* platform/mac/media/video-controls-rendering-expected.png:
* platform/mac/media/video-controls-rendering-expected.txt:
* platform/mac/media/video-display-toggle-expected.png:
* platform/mac/media/video-display-toggle-expected.txt:
* platform/mac/media/video-empty-source-expected.png:
* platform/mac/media/video-empty-source-expected.txt:
* platform/mac/media/video-no-audio-expected.png:
* platform/mac/media/video-no-audio-expected.txt:
* platform/mac/media/video-volume-slider-expected.png:
* platform/mac/media/video-volume-slider-expected.txt:
* platform/mac/media/video-zoom-controls-expected.png:
* platform/mac/media/video-zoom-controls-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt">trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastlayersvideolayerexpectedtxt">trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedpng">trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedpng">trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsstrictexpectedpng">trunk/LayoutTests/platform/mac/media/controls-strict-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolsstrictexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolswithoutpreloadexpectedpng">trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolswithoutpreloadexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediamediacontrolscloneexpectedpng">trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediamediacontrolscloneexpectedtxt">trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedpng">trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedpng">trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedtxt">trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideoemptysourceexpectedpng">trunk/LayoutTests/platform/mac/media/video-empty-source-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideoemptysourceexpectedtxt">trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideonoaudioexpectedpng">trunk/LayoutTests/platform/mac/media/video-no-audio-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideonoaudioexpectedtxt">trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideovolumesliderexpectedpng">trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideovolumesliderexpectedtxt">trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedpng">trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediaaudiocontrolsrenderingexpectedpng">trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediaaudiocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediacontrolsstrictexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/controls-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideocontrolsrenderingexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-controls-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideodisplaytoggleexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-display-toggle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideonoaudioexpectedpng">trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideonoaudioexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideovolumesliderexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideozoomcontrolsexpectedpng">trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideozoomcontrolsexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediacontrolswithoutpreloadexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/controls-without-preload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediavideoemptysourceexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/video-empty-source-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/ChangeLog 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -1,3 +1,47 @@
</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.
+
+ * platform/mac-mavericks/media/audio-controls-rendering-expected.png:
+ * platform/mac-mavericks/media/audio-controls-rendering-expected.txt:
+ * platform/mac-mavericks/media/controls-strict-expected.txt:
+ * platform/mac-mavericks/media/controls-without-preload-expected.txt: Copied from LayoutTests/platform/mac/media/controls-without-preload-expected.txt.
+ * platform/mac-mavericks/media/video-controls-rendering-expected.txt:
+ * platform/mac-mavericks/media/video-display-toggle-expected.txt:
+ * platform/mac-mavericks/media/video-empty-source-expected.txt: Copied from LayoutTests/platform/mac/media/video-empty-source-expected.txt.
+ * platform/mac-mavericks/media/video-no-audio-expected.png:
+ * platform/mac-mavericks/media/video-no-audio-expected.txt:
+ * platform/mac-mavericks/media/video-volume-slider-expected.txt:
+ * platform/mac-mavericks/media/video-zoom-controls-expected.png:
+ * platform/mac-mavericks/media/video-zoom-controls-expected.txt:
+ * 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.png:
+ * platform/mac/media/audio-controls-rendering-expected.txt:
+ * platform/mac/media/controls-after-reload-expected.png:
+ * platform/mac/media/controls-after-reload-expected.txt:
+ * platform/mac/media/controls-strict-expected.png:
+ * platform/mac/media/controls-strict-expected.txt:
+ * platform/mac/media/controls-without-preload-expected.png:
+ * platform/mac/media/controls-without-preload-expected.txt:
+ * platform/mac/media/media-controls-clone-expected.png:
+ * platform/mac/media/media-controls-clone-expected.txt:
+ * platform/mac/media/video-controls-rendering-expected.png:
+ * platform/mac/media/video-controls-rendering-expected.txt:
+ * platform/mac/media/video-display-toggle-expected.png:
+ * platform/mac/media/video-display-toggle-expected.txt:
+ * platform/mac/media/video-empty-source-expected.png:
+ * platform/mac/media/video-empty-source-expected.txt:
+ * platform/mac/media/video-no-audio-expected.png:
+ * platform/mac/media/video-no-audio-expected.txt:
+ * platform/mac/media/video-volume-slider-expected.png:
+ * platform/mac/media/video-volume-slider-expected.txt:
+ * platform/mac/media/video-zoom-controls-expected.png:
+ * platform/mac/media/video-zoom-controls-expected.txt:
+
</ins><span class="cx"> 2014-10-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> text-combine needs to center glyphs within the vertical area.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasthidpivideocontrolsinhidpiexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/fast/hidpi/video-controls-in-hidpi-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,125) size 300x25
-layer at (8,151) size 300x25
- RenderFlexibleBox {DIV} at (0,0) size 300x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,125) 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="trunkLayoutTestsplatformmacfastlayersvideolayerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/fast/layers/video-layer-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -18,9 +18,7 @@
</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>- RenderBlock {DIV} at (0,125) size 300x25
-layer at (59,236) size 300x25
- RenderFlexibleBox {DIV} at (0,0) size 300x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,125) 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="trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/audio-controls-rendering-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -16,7 +16,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 200x25
</del><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">@@ -55,7 +54,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 320x25
</del><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">@@ -96,9 +94,8 @@
</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><del>- RenderBlock {DIV} at (0,75) size 320x25
</del><span class="cx"> layer at (8,203) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,75) 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="trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolsafterreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/controls-after-reload-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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 class="lines">@@ -24,14 +22,14 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (49,7) size 217x12
</span><span class="cx"> layer at (57,265) size 45x11
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
</span><del>- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
</del><ins>+ RenderBlock (anonymous) at (10,0) size 25x11
+ RenderText {#text} at (0,0) size 25x11
+ text run at (0,0) width 25: "00:00"
</ins><span class="cx"> layer at (229,265) size 45x11
</span><span class="cx"> RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
</span><del>- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:06"
</del><ins>+ RenderBlock (anonymous) at (8,0) size 29x11
+ RenderText {#text} at (0,0) size 29x11
+ text run at (0,0) width 29: "-00:06"
</ins><span class="cx"> layer at (104,266) size 123x9
</span><span class="cx"> RenderFlexibleBox {DIV} at (47,1) size 123x9
</span><span class="cx"> RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolsstrictexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-strict-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolsstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/controls-strict-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,265) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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="trunkLayoutTestsplatformmacmediacontrolswithoutpreloadexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolswithoutpreloadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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 class="lines">@@ -24,14 +22,14 @@
</span><span class="cx"> RenderFlexibleBox {DIV} at (49,7) size 217x12
</span><span class="cx"> layer at (57,265) size 45x11
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
</span><del>- RenderBlock (anonymous) at (9,0) size 27x11
- RenderText {#text} at (0,0) size 26x11
- text run at (0,0) width 26: "00:00"
</del><ins>+ RenderBlock (anonymous) at (10,0) size 25x11
+ RenderText {#text} at (0,0) size 25x11
+ text run at (0,0) width 25: "00:00"
</ins><span class="cx"> layer at (229,265) size 45x11
</span><span class="cx"> RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
</span><del>- RenderBlock (anonymous) at (7,0) size 31x11
- RenderText {#text} at (0,0) size 31x11
- text run at (0,0) width 31: "-00:06"
</del><ins>+ RenderBlock (anonymous) at (8,0) size 29x11
+ RenderText {#text} at (0,0) size 29x11
+ text run at (0,0) width 29: "-00:06"
</ins><span class="cx"> layer at (104,266) size 123x9
</span><span class="cx"> RenderFlexibleBox {DIV} at (47,1) size 123x9
</span><span class="cx"> RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediamediacontrolscloneexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediamediacontrolscloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/media-controls-clone-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -14,9 +14,7 @@
</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>- RenderBlock {DIV} at (0,125) size 300x25
-layer at (8,133) size 300x25
- RenderFlexibleBox {DIV} at (0,0) size 300x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,125) 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">@@ -27,7 +25,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 200x25
</del><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">@@ -41,9 +38,7 @@
</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>- RenderBlock {DIV} at (0,125) size 300x25
-layer at (8,287) size 300x25
- RenderFlexibleBox {DIV} at (0,0) size 300x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,125) 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">@@ -54,7 +49,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 200x25
</del><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="trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-controls-rendering-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -18,9 +18,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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 class="lines">@@ -60,9 +58,7 @@
</span><span class="cx"> layer at (8,282) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,497) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,497) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,502) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,502) size 16x16
</span><span class="lines">@@ -104,9 +100,7 @@
</span><span class="cx"> layer at (8,522) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,737) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,737) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,742) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,742) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideodisplaytoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-display-toggle-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -12,9 +12,7 @@
</span><span class="cx"> layer at (8,26) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,241) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,241) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,246) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,246) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideoemptysourceexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-empty-source-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideoemptysourceexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</span><span class="cx"> layer at (9,43) size 300x150
</span><span class="cx"> RenderFlexibleBox {DIV} at (1,1) size 300x150
</span><span class="cx"> layer at (9,168) size 300x25
</span><del>- RenderBlock {DIV} at (0,125) size 300x25
-layer at (9,168) size 300x25
- RenderFlexibleBox {DIV} at (0,0) size 300x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,125) size 300x25
</ins><span class="cx"> layer at (58,169) size 138x25
</span><span class="cx"> RenderBlock {DIV} at (49,0) size 138x26 [color=#FFFFFF]
</span><span class="cx"> RenderText {#text} at (12,7) size 22x11
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideonoaudioexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideonoaudioexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,263) size 352x25
-layer at (8,305) size 352x25
- RenderFlexibleBox {DIV} at (0,0) size 352x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,263) 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="trunkLayoutTestsplatformmacmediavideovolumesliderexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideovolumesliderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-volume-slider-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -18,9 +18,7 @@
</span><span class="cx"> layer at (8,62) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,277) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,277) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,282) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,282) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac/media/video-zoom-controls-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -11,9 +11,7 @@
</span><span class="cx"> layer at (57,85) size 240x180
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 240x180
</span><span class="cx"> layer at (57,228) size 240x37
</span><del>- RenderBlock {DIV} at (0,142) size 240x38
-layer at (57,228) size 240x38
- RenderFlexibleBox {DIV} at (0,0) size 240x38
</del><ins>+ RenderFlexibleBox {DIV} at (0,142) size 240x38
</ins><span class="cx"> layer at (66,234) size 24x24
</span><span class="cx"> RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
</span><span class="cx"> layer at (105,235) size 24x24
</span><span class="lines">@@ -50,9 +48,7 @@
</span><span class="cx"> layer at (57,310) size 240x180
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 240x180
</span><span class="cx"> layer at (57,453) size 240x37
</span><del>- RenderBlock {DIV} at (0,142) size 240x38
-layer at (57,453) size 240x38
- RenderFlexibleBox {DIV} at (0,0) size 240x38
</del><ins>+ RenderFlexibleBox {DIV} at (0,142) size 240x38
</ins><span class="cx"> layer at (66,459) size 24x24
</span><span class="cx"> RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
</span><span class="cx"> layer at (105,460) size 24x24
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediaaudiocontrolsrenderingexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediaaudiocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/audio-controls-rendering-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -16,7 +16,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 200x25
</del><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">@@ -55,7 +54,6 @@
</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><del>- RenderBlock {DIV} at (0,0) size 320x25
</del><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">@@ -96,9 +94,8 @@
</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><del>- RenderBlock {DIV} at (0,75) size 320x25
</del><span class="cx"> layer at (8,203) size 320x25
</span><del>- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,75) 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="trunkLayoutTestsplatformmacmavericksmediacontrolsstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/controls-strict-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/controls-strict-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/controls-strict-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,265) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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="trunkLayoutTestsplatformmacmavericksmediacontrolswithoutpreloadexpectedtxtfromrev175267trunkLayoutTestsplatformmacmediacontrolswithoutpreloadexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/media/controls-without-preload-expected.txt (from rev 175267, trunk/LayoutTests/platform/mac/media/controls-without-preload-expected.txt) (0 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/controls-without-preload-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/media/controls-without-preload-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 312x18
+ text run at (0,0) width 312: "The controls should not depend on preload value."
+ RenderBlock (anonymous) at (0,34) size 784x240
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 320x240
+ RenderVideo {VIDEO} at (0,0) size 320x240
+layer at (8,42) size 320x240
+ RenderFlexibleBox {DIV} at (0,0) size 320x240
+layer at (8,257) size 320x25
+ RenderFlexibleBox {DIV} at (0,215) size 320x25
+layer at (14,262) size 16x16
+ RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (40,262) size 16x16
+ RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (57,265) size 217x11
+ RenderFlexibleBox {DIV} at (49,7) size 217x12
+layer at (57,265) size 45x11
+ RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF]
+ RenderBlock (anonymous) at (9,0) size 27x11
+ RenderText {#text} at (0,0) size 26x11
+ text run at (0,0) width 26: "00:00"
+layer at (229,265) size 45x11
+ RenderFlexibleBox {DIV} at (172,0) size 45x11 [color=#FFFFFF]
+ RenderBlock (anonymous) at (7,0) size 31x11
+ RenderText {#text} at (0,0) size 31x11
+ text run at (0,0) width 31: "-00:06"
+layer at (104,266) size 123x9
+ RenderFlexibleBox {DIV} at (47,1) size 123x9
+ RenderSlider {INPUT} at (0,0) size 123x9 [color=#909090] [bgcolor=#4A4A4A]
+ RenderFlexibleBox {DIV} at (0,0) size 123x9
+ RenderBlock {DIV} at (0,1) size 123x7
+layer at (104,267) size 6x6
+ RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF]
+layer at (274,259) size 22x22
+ RenderFlexibleBox {DIV} at (266,2) size 22x22
+layer at (274,259) size 2x22
+ RenderFlexibleBox {DIV} at (0,0) size 2x22 [border: (1px solid #000000F3)]
+ RenderSlider {INPUT} at (-7,6) size 2x10 [color=#909090] [border: (1px solid #000000DF)]
+ RenderFlexibleBox {DIV} at (1,1) size 0x8
+ RenderBlock {DIV} at (0,0) size 0x8
+layer at (260,266) size 8x8
+ RenderBlock {DIV} at (-8,0) size 8x8
+layer at (277,262) size 16x16
+ RenderButton {BUTTON} at (3,3) size 16x16 [color=#FFFFFF]
+layer at (305,262) size 16x16
+ RenderButton {BUTTON} at (297,5) size 16x16 [color=#FFFFFF]
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideocontrolsrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-controls-rendering-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-controls-rendering-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-controls-rendering-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -18,9 +18,7 @@
</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>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,257) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) 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 class="lines">@@ -60,9 +58,7 @@
</span><span class="cx"> layer at (8,282) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,497) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,497) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,502) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,502) size 16x16
</span><span class="lines">@@ -104,9 +100,7 @@
</span><span class="cx"> layer at (8,522) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,737) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,737) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,742) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,742) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideodisplaytoggleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-display-toggle-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-display-toggle-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-display-toggle-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -12,9 +12,7 @@
</span><span class="cx"> layer at (8,26) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,241) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,241) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,246) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,246) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideoemptysourceexpectedtxtfromrev175267trunkLayoutTestsplatformmacmediavideoemptysourceexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-mavericks/media/video-empty-source-expected.txt (from rev 175267, trunk/LayoutTests/platform/mac/media/video-empty-source-expected.txt) (0 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-empty-source-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-empty-source-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 430x18
+ text run at (0,0) width 430: "Slider drawing with no source. The controls should render correctly."
+ RenderBlock (anonymous) at (0,34) size 784x152
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,42) size 302x152
+ RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
+layer at (9,43) size 300x150
+ RenderFlexibleBox {DIV} at (1,1) size 300x150
+layer at (9,168) size 300x25
+ RenderFlexibleBox {DIV} at (0,125) size 300x25
+layer at (58,169) size 138x25
+ RenderBlock {DIV} at (49,0) size 138x26 [color=#FFFFFF]
+ RenderText {#text} at (12,7) size 22x11
+ text run at (12,7) width 22: "Error"
+layer at (15,173) size 16x16
+ RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
+layer at (41,173) size 16x16
+ RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF]
+layer at (196,177) size 113x9
+ RenderFlexibleBox {DIV} at (186,8) size 114x10
+layer at (198,177) size 110x9
+ RenderFlexibleBox {DIV} at (2,0) size 110x9
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideonoaudioexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideonoaudioexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-no-audio-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -13,9 +13,7 @@
</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>- RenderBlock {DIV} at (0,263) size 352x25
-layer at (8,305) size 352x25
- RenderFlexibleBox {DIV} at (0,0) size 352x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,263) 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="trunkLayoutTestsplatformmacmavericksmediavideovolumesliderexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-volume-slider-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -18,9 +18,7 @@
</span><span class="cx"> layer at (8,62) size 320x240
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 320x240
</span><span class="cx"> layer at (8,277) size 320x25
</span><del>- RenderBlock {DIV} at (0,215) size 320x25
-layer at (8,277) size 320x25
- RenderFlexibleBox {DIV} at (0,0) size 320x25
</del><ins>+ RenderFlexibleBox {DIV} at (0,215) size 320x25
</ins><span class="cx"> layer at (14,282) size 16x16
</span><span class="cx"> RenderButton {BUTTON} at (6,4) size 16x17 [color=#FFFFFF]
</span><span class="cx"> layer at (40,282) size 16x16
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideozoomcontrolsexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediavideozoomcontrolsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.txt (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.txt 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/LayoutTests/platform/mac-mavericks/media/video-zoom-controls-expected.txt 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -11,9 +11,7 @@
</span><span class="cx"> layer at (57,85) size 240x180
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 240x180
</span><span class="cx"> layer at (57,228) size 240x37
</span><del>- RenderBlock {DIV} at (0,142) size 240x38
-layer at (57,228) size 240x38
- RenderFlexibleBox {DIV} at (0,0) size 240x38
</del><ins>+ RenderFlexibleBox {DIV} at (0,142) size 240x38
</ins><span class="cx"> layer at (66,234) size 24x24
</span><span class="cx"> RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
</span><span class="cx"> layer at (105,235) size 24x24
</span><span class="lines">@@ -50,9 +48,7 @@
</span><span class="cx"> layer at (57,310) size 240x180
</span><span class="cx"> RenderFlexibleBox {DIV} at (0,0) size 240x180
</span><span class="cx"> layer at (57,453) size 240x37
</span><del>- RenderBlock {DIV} at (0,142) size 240x38
-layer at (57,453) size 240x38
- RenderFlexibleBox {DIV} at (0,0) size 240x38
</del><ins>+ RenderFlexibleBox {DIV} at (0,142) size 240x38
</ins><span class="cx"> layer at (66,459) size 24x24
</span><span class="cx"> RenderButton {BUTTON} at (9,6) size 24x25 [color=#FFFFFF]
</span><span class="cx"> layer at (105,460) size 24x24
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/Source/WebCore/ChangeLog 2014-10-28 19:37:22 UTC (rev 175268)
</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-10-28 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Move "Number" CSS properties to the new StyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2014-10-28 19:37:22 UTC (rev 175268)
</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">@@ -537,6 +532,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="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -282,9 +282,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">@@ -1052,8 +1049,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="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (175267 => 175268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-10-28 19:12:37 UTC (rev 175267)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-10-28 19:37:22 UTC (rev 175268)
</span><span class="lines">@@ -136,6 +136,10 @@
</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">@@ -218,6 +222,12 @@
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</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>