<!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>[185258] 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/185258">185258</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 11:39:08 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
fail on WK1 and WK2
https://bugs.webkit.org/show_bug.cgi?id=145675
Reviewed by Dean Jackson.
Source/WebCore:
No new tests, changes covered by existing tests.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateControls): Use shouldHaveControls() to test if controls should
be visible.
(Controller.prototype.handleWrapperMouseMove): Don't return early when in fullscreen.
(Controller.prototype.updateFullscreenButtons): Drive-by fix: always show the (exit) fullscreen
button when in fullscreen.
LayoutTests:
* TestExpectations: Unskip tests.
* fullscreen/video-controls-drag.html: Minor cleanup, force layout before testing control location.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsfullscreenvideocontrolsdraghtml">trunk/LayoutTests/fullscreen/video-controls-drag.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185257 => 185258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/ChangeLog 2015-06-05 18:39:08 UTC (rev 185258)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-05 Eric Carlson <eric.carlson@apple.com>
+
+ Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
+ fail on WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=145675
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations: Unskip tests.
+ * fullscreen/video-controls-drag.html: Minor cleanup, force layout before testing control location.
+
</ins><span class="cx"> 2015-06-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Rebaseline expected results.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (185257 => 185258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/TestExpectations 2015-06-05 18:39:08 UTC (rev 185258)
</span><span class="lines">@@ -525,6 +525,3 @@
</span><span class="cx"> webkit.org/b/145007 js/regress-141098.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/145390 storage/indexeddb/deleteIndex-bug110792.html [ Pass Failure ]
</span><del>-
-webkit.org/b/145675 fullscreen/video-controls-drag.html [ Skip ]
-webkit.org/b/145675 media/video-fullscreeen-only-controls.html [ Skip ]
</del></span></pre></div>
<a id="trunkLayoutTestsfullscreenvideocontrolsdraghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fullscreen/video-controls-drag.html (185257 => 185258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fullscreen/video-controls-drag.html 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/LayoutTests/fullscreen/video-controls-drag.html 2015-06-05 18:39:08 UTC (rev 185258)
</span><span class="lines">@@ -5,18 +5,17 @@
</span><span class="cx"> <script src="../media/media-controls.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> var video = document.getElementById('video');
</span><del>- var shadowRoot;
</del><span class="cx"> var panel;
</span><span class="cx"> var startBox;
</span><span class="cx"> var endBox;
</span><span class="cx">
</span><del>- var fullscreenChanged = function(event)
- {
- if (callback)
- callback(event)
- };
</del><span class="cx"> waitForEvent(document, 'webkitfullscreenchange', function() {
</span><span class="cx"> if (window.internals) {
</span><ins>+
+ // Force a relayout to ensure that the controls in the shadow DOM have been
+ // positioned correctly.
+ document.body.offsetTop;
+
</ins><span class="cx"> panel = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-panel');
</span><span class="cx"> startBox = internals.boundingBox(panel);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185257 => 185258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/Source/WebCore/ChangeLog 2015-06-05 18:39:08 UTC (rev 185258)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-05 Eric Carlson <eric.carlson@apple.com>
+
+ Layout tests fullscreen/video-controls-drag.html and media/video-fullscreeen-only-controls.html
+ fail on WK1 and WK2
+ https://bugs.webkit.org/show_bug.cgi?id=145675
+
+ Reviewed by Dean Jackson.
+
+ No new tests, changes covered by existing tests.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateControls): Use shouldHaveControls() to test if controls should
+ be visible.
+ (Controller.prototype.handleWrapperMouseMove): Don't return early when in fullscreen.
+ (Controller.prototype.updateFullscreenButtons): Drive-by fix: always show the (exit) fullscreen
+ button when in fullscreen.
+
+
</ins><span class="cx"> 2015-06-04 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Underlines too close in vertical Chinese text.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (185257 => 185258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-06-05 18:35:13 UTC (rev 185257)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-06-05 18:39:08 UTC (rev 185258)
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> this.updateLayoutForDisplayedWidth();
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx">
</span><del>- if (this.video.controls || this.isFullScreen()) {
</del><ins>+ if (this.shouldHaveControls()) {
</ins><span class="cx"> this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> this.resetHideControlsTimer();
</span><span class="lines">@@ -788,7 +788,7 @@
</span><span class="cx">
</span><span class="cx"> handleWrapperMouseMove: function(event)
</span><span class="cx"> {
</span><del>- if (!this.video.controls)
</del><ins>+ if (!this.video.controls && !this.isFullScreen())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (this.controlsAreHidden())
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> updateFullscreenButtons: function()
</span><span class="cx"> {
</span><span class="cx"> var shouldBeHidden = !this.video.webkitSupportsFullscreen || !this.hasVideo();
</span><del>- this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
</del><ins>+ this.controls.fullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden && !this.isFullScreen());
</ins><span class="cx"> this.controls.optimizedFullscreenButton.classList.toggle(this.ClassNames.hidden, shouldBeHidden);
</span><span class="cx"> this.setNeedsUpdateForDisplayedWidth();
</span><span class="cx"> this.updateLayoutForDisplayedWidth();
</span></span></pre>
</div>
</div>
</body>
</html>