<!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>[213317] trunk/LayoutTests</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/213317">213317</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-02 15:53:49 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTest media/modern-media-controls/volume-support/volume-support-drag.html is a flaky failure
https://bugs.webkit.org/show_bug.cgi?id=164226
<rdar://problem/30811901>
Patch by Antoine Quint <graouts@apple.com> on 2017-03-02
Reviewed by Dean Jackson.
Use asynchronous assertions to step through the test and make it more robust.
* media/modern-media-controls/volume-support/volume-support-drag-expected.txt:
* media/modern-media-controls/volume-support/volume-support-drag.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdragexpectedtxt">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdraghtml">trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213316 => 213317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-02 23:50:59 UTC (rev 213316)
+++ trunk/LayoutTests/ChangeLog 2017-03-02 23:53:49 UTC (rev 213317)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-02 Antoine Quint <graouts@apple.com>
+
+ LayoutTest media/modern-media-controls/volume-support/volume-support-drag.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=164226
+ <rdar://problem/30811901>
+
+ Reviewed by Dean Jackson.
+
+ Use asynchronous assertions to step through the test and make it more robust.
+
+ * media/modern-media-controls/volume-support/volume-support-drag-expected.txt:
+ * media/modern-media-controls/volume-support/volume-support-drag.html:
+
</ins><span class="cx"> 2017-03-02 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Update fast/css/flex-calculated-value.html after r213305.
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdragexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt (213316 => 213317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt 2017-03-02 23:50:59 UTC (rev 213316)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag-expected.txt 2017-03-02 23:53:49 UTC (rev 213317)
</span><span class="lines">@@ -5,16 +5,18 @@
</span><span class="cx">
</span><span class="cx"> By default, the volume slider should be set to 0 because the media is muted
</span><span class="cx"> PASS mediaController.controls.volumeSlider.value is 0
</span><ins>+PASS muteButton.getBoundingClientRect().width became different from 0
+PASS volumeSlider.getBoundingClientRect().width became different from 0
</ins><span class="cx">
</span><span class="cx"> Before starting to drag the volume slider, the media should be muted still
</span><span class="cx"> PASS media.muted is true
</span><span class="cx">
</span><span class="cx"> We initiated a volume slider drag, the media should no longer be muted and the volume set
</span><del>-PASS media.muted is false
-PASS media.volume is 0.5
</del><ins>+PASS media.muted became false
+PASS media.volume became 0.5
</ins><span class="cx">
</span><span class="cx"> We finished dragging to set the volume to 1
</span><del>-PASS media.volume is 1
</del><ins>+PASS media.volume became 1
</ins><span class="cx"> PASS mediaController.controls.volumeSlider.parent.visible is true
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediamodernmediacontrolsvolumesupportvolumesupportdraghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html (213316 => 213317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2017-03-02 23:50:59 UTC (rev 213316)
+++ trunk/LayoutTests/media/modern-media-controls/volume-support/volume-support-drag.html 2017-03-02 23:53:49 UTC (rev 213317)
</span><span class="lines">@@ -25,63 +25,59 @@
</span><span class="cx"> const media = document.querySelector("video");
</span><span class="cx"> const mediaController = createControls(container, media, null);
</span><span class="cx">
</span><ins>+const muteButton = mediaController.controls.muteButton.element;
+const volumeSlider = mediaController.controls.volumeSlider.children[1].element;
+
</ins><span class="cx"> debug("By default, the volume slider should be set to 0 because the media is muted");
</span><span class="cx"> shouldBe("mediaController.controls.volumeSlider.value", "0");
</span><span class="cx">
</span><del>-let numberOfFrames = 0;
-scheduler.frameDidFire = function() {
- const muteButtonElement = mediaController.controls.muteButton.element;
- const muteButtonBounds = muteButtonElement.getBoundingClientRect();
- if (media.paused || muteButtonBounds.width === 0)
- return;
-
- numberOfFrames++;
-
- if (numberOfFrames == 1) {
</del><ins>+media.addEventListener("play", () => {
+ media.pause();
+ shouldBecomeDifferent("muteButton.getBoundingClientRect().width", "0", () => {
+ const muteButtonBounds = muteButton.getBoundingClientRect();
</ins><span class="cx"> // Controls are now visible, let's hover over the mute button to make the volume control visible.
</span><span class="cx"> eventSender.mouseMoveTo(muteButtonBounds.left + muteButtonBounds.width / 2, muteButtonBounds.top + muteButtonBounds.height / 2);
</span><del>- } else if (numberOfFrames == 2) {
- // Volume slider is visible, let's start dragging in the middle of it.
- const bounds = mediaController.controls.volumeSlider.children[1].element.getBoundingClientRect();
- const centerX = bounds.left + bounds.width / 2;
- const dragStartY = bounds.top + bounds.height / 2;
- const dragEndY = bounds.top;
- const delta = dragEndY - dragStartY;
- const iterations = Math.abs(delta);
</del><ins>+ shouldBecomeDifferent("volumeSlider.getBoundingClientRect().width", "0", () => {
+ // Volume slider is visible, let's start dragging in the middle of it.
+ const bounds = volumeSlider.getBoundingClientRect();
+ const centerX = bounds.left + bounds.width / 2;
+ const dragStartY = bounds.top + bounds.height / 2;
+ const dragEndY = bounds.top;
+ const delta = dragEndY - dragStartY;
+ const iterations = Math.abs(delta);
</ins><span class="cx">
</span><del>- debug("");
- debug("Before starting to drag the volume slider, the media should be muted still");
- shouldBeTrue("media.muted");
</del><ins>+ debug("");
+ debug("Before starting to drag the volume slider, the media should be muted still");
+ shouldBeTrue("media.muted");
</ins><span class="cx">
</span><del>- eventSender.mouseMoveTo(centerX, dragStartY);
- eventSender.mouseDown();
</del><ins>+ eventSender.mouseMoveTo(centerX, dragStartY);
+ eventSender.mouseDown();
</ins><span class="cx">
</span><del>- debug("");
- debug("We initiated a volume slider drag, the media should no longer be muted and the volume set");
- shouldBeFalse("media.muted");
- shouldBe("media.volume", "0.5");
</del><ins>+ debug("");
+ debug("We initiated a volume slider drag, the media should no longer be muted and the volume set");
+ shouldBecomeEqual("media.muted", "false", () => {
+ shouldBecomeEqual("media.volume", "0.5", () => {
+ for (let i = 1; i <= iterations; ++i)
+ eventSender.mouseMoveTo(bounds.left + bounds.width / 2, dragStartY + i * Math.sign(delta));
</ins><span class="cx">
</span><del>- for (let i = 1; i <= iterations; ++i)
- eventSender.mouseMoveTo(bounds.left + bounds.width / 2, dragStartY + i * Math.sign(delta));
</del><ins>+ eventSender.mouseUp();
</ins><span class="cx">
</span><del>- eventSender.mouseUp();
</del><ins>+ debug("");
+ debug("We finished dragging to set the volume to 1");
+ shouldBecomeEqual("media.volume", "1", () => {
+ // Ensure the volume slider remains visible.
+ shouldBeTrue("mediaController.controls.volumeSlider.parent.visible");
</ins><span class="cx">
</span><del>- debug("");
- debug("We finished dragging to set the volume to 1");
- shouldBe("media.volume", "1");
</del><ins>+ container.remove();
+ media.remove();
+ finishJSTest();
+ });
+ });
+ });
+ });
+ });
+});
</ins><span class="cx">
</span><del>- // Ensure the volume slider remains visible.
- shouldBeTrue("mediaController.controls.volumeSlider.parent.visible");
-
- container.remove();
- media.remove();
- finishMediaControlsTest();
- }
-};
-
-// First, ensure controls are shown.
-mediaController.controls.showsStartButton = false;
-
</del><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre>
</div>
</div>
</body>
</html>