<!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>[187762] 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/187762">187762</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-08-03 14:05:23 -0700 (Mon, 03 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inline video controls overlap each other while playing video in slideover mode
https://bugs.webkit.org/show_bug.cgi?id=147535
<rdar://problem/22026864>
Reviewed by Eric Carlson.
Now that the resizing code is in the shared controller, we need to
make sure to hide the timeline scrubber in iOS when the controls
get too small. This involved adding the dropped class to the timeline,
and rules for hiding to the CSS.
Meanwhile, when the page scale factor is less than one, we use the CSS zoom property
and don't need to factor in the page scale factor when calculating
the size.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateLayoutForDisplayedWidth): Don't use pageScaleFactor.
* Modules/mediacontrols/mediaControlsiOS.css:
(audio::-webkit-media-controls-panel .dropped): Add display none for this rule.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187761 => 187762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-03 20:56:15 UTC (rev 187761)
+++ trunk/Source/WebCore/ChangeLog 2015-08-03 21:05:23 UTC (rev 187762)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-03 Dean Jackson <dino@apple.com>
+
+ Inline video controls overlap each other while playing video in slideover mode
+ https://bugs.webkit.org/show_bug.cgi?id=147535
+ <rdar://problem/22026864>
+
+ Reviewed by Eric Carlson.
+
+ Now that the resizing code is in the shared controller, we need to
+ make sure to hide the timeline scrubber in iOS when the controls
+ get too small. This involved adding the dropped class to the timeline,
+ and rules for hiding to the CSS.
+
+ Meanwhile, when the page scale factor is less than one, we use the CSS zoom property
+ and don't need to factor in the page scale factor when calculating
+ the size.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateLayoutForDisplayedWidth): Don't use pageScaleFactor.
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (audio::-webkit-media-controls-panel .dropped): Add display none for this rule.
+
</ins><span class="cx"> 2015-08-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Safari is failing to remove SQLite Databases via Remove All Website Data
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (187761 => 187762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-03 20:56:15 UTC (rev 187761)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-08-03 21:05:23 UTC (rev 187762)
</span><span class="lines">@@ -1453,7 +1453,10 @@
</span><span class="cx"> if (!this.controls || !this.controls.panel)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var visibleWidth = this.controls.panel.getBoundingClientRect().width * this._pageScaleFactor;
</del><ins>+ var visibleWidth = this.controls.panel.getBoundingClientRect().width;
+ if (this._pageScaleFactor > 1)
+ visibleWidth *= this._pageScaleFactor;
+
</ins><span class="cx"> if (visibleWidth <= 0 || visibleWidth == this.currentDisplayWidth)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1470,6 +1473,7 @@
</span><span class="cx">
</span><span class="cx"> // Check if there is enough room for the scrubber.
</span><span class="cx"> var shouldDropTimeline = (visibleWidth - visibleButtonWidth) < this.MinimumTimelineWidth;
</span><ins>+ this.controls.timeline.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</ins><span class="cx"> this.controls.currentTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span><span class="cx"> this.controls.thumbnailTrack.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span><span class="cx"> this.controls.remainingTime.classList.toggle(this.ClassNames.dropped, shouldDropTimeline);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (187761 => 187762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-03 20:56:15 UTC (rev 187761)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-08-03 21:05:23 UTC (rev 187762)
</span><span class="lines">@@ -153,7 +153,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-panel .hidden,
</span><del>-audio::-webkit-media-controls-panel .hidden {
</del><ins>+audio::-webkit-media-controls-panel .hidden,
+video::-webkit-media-controls-panel .dropped,
+audio::-webkit-media-controls-panel .dropped {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>