<!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>[189359] 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/189359">189359</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-09-04 11:12:21 -0700 (Fri, 04 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[mediacontrols] Test the ordering of elements in the controls panel
https://bugs.webkit.org/show_bug.cgi?id=148804
<rdar://problem/22579232>
Reviewed by Eric Carlson.
Source/WebCore:
Add information about various controls elements to the status object.
Test: media/controls/elementOrder.html
* Modules/mediacontrols/mediaControlsApple.js:
LayoutTests:
Add a new test that checks the visual order of the buttons and
elements in the controls panel. This is helpful because they
are not necessarily in that order within the DOM.
I also added caching of the current state to the testing helper,
to save generating the JSON status multiple times in subsequent
calls.
* media/controls/elementOrder.html: New test.
* media/controls/elementOrder-expected.txt: New results.
* media/controls/controls-test-helpers.js:
(ControlsTest):
(ControlsTest.prototype.get currentState): Added caching.
(ControlsTest.prototype.stateForControlsElement):
(ControlsTest.prototype.isGreaterThan): New test helper.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediacontrolscontrolstesthelpersjs">trunk/LayoutTests/media/controls/controls-test-helpers.js</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontrolselementOrderexpectedtxt">trunk/LayoutTests/media/controls/elementOrder-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolselementOrderhtml">trunk/LayoutTests/media/controls/elementOrder.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189358 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-04 18:12:16 UTC (rev 189358)
+++ trunk/LayoutTests/ChangeLog 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-09-04 Dean Jackson <dino@apple.com>
+
+ [mediacontrols] Test the ordering of elements in the controls panel
+ https://bugs.webkit.org/show_bug.cgi?id=148804
+ <rdar://problem/22579232>
+
+ Reviewed by Eric Carlson.
+
+ Add a new test that checks the visual order of the buttons and
+ elements in the controls panel. This is helpful because they
+ are not necessarily in that order within the DOM.
+
+ I also added caching of the current state to the testing helper,
+ to save generating the JSON status multiple times in subsequent
+ calls.
+
+ * media/controls/elementOrder.html: New test.
+ * media/controls/elementOrder-expected.txt: New results.
+ * media/controls/controls-test-helpers.js:
+ (ControlsTest):
+ (ControlsTest.prototype.get currentState): Added caching.
+ (ControlsTest.prototype.stateForControlsElement):
+ (ControlsTest.prototype.isGreaterThan): New test helper.
+
</ins><span class="cx"> 2015-09-03 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [mediacontrols] Expose bounding rectangles and computed style to testing
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolscontrolstesthelpersjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/controls/controls-test-helpers.js (189358 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-09-04 18:12:16 UTC (rev 189358)
+++ trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> this.eventTrigger = eventTrigger || "canplaythrough";
</span><span class="cx"> this.currentMessage = "";
</span><span class="cx"> this.currentValue = null;
</span><ins>+ this.cachedCurrentState = null;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> whenReady(callback)
</span><span class="lines">@@ -25,8 +26,10 @@
</span><span class="cx"> if (!this.media)
</span><span class="cx"> return null;
</span><span class="cx">
</span><del>- if (window.internals)
- return JSON.parse(internals.getCurrentMediaControlsStatusForElement(this.media));
</del><ins>+ if (window.internals) {
+ this.cachedCurrentState = JSON.parse(internals.getCurrentMediaControlsStatusForElement(this.media));
+ return this.cachedCurrentState;
+ }
</ins><span class="cx">
</span><span class="cx"> // This is only for fallback testing. Even then it is pretty useless.
</span><span class="cx"> return { idiom: "apple", status: "fail" };
</span><span class="lines">@@ -34,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> stateForControlsElement(elementName)
</span><span class="cx"> {
</span><del>- var state = this.currentState;
</del><ins>+ var state = this.cachedCurrentState || this.currentState;
</ins><span class="cx"> if (state.elements && state.elements.length) {
</span><span class="cx"> for (var i = 0; i < state.elements.length; i++) {
</span><span class="cx"> if (state.elements[i].name == elementName)
</span><span class="lines">@@ -175,4 +178,12 @@
</span><span class="cx"> this.logFailure(`${this.currentMessage} Expected a non-zero value`);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ isGreaterThan(value)
+ {
+ if (this.currentValue > value)
+ this.logSuccess(this.currentMessage);
+ else
+ this.logFailure(`${this.currentMessage} Actual: "${this.currentValue}" is not greater than Expected: "${value}"`);
+ }
+
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolselementOrderexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/elementOrder-expected.txt (0 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/elementOrder-expected.txt (rev 0)
+++ trunk/LayoutTests/media/controls/elementOrder-expected.txt 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+This tests for the content in the status display.
+
+This test only runs in DRT!
+
+
+EVENT: canplaythrough
+PASS: We are using the apple idiom
+PASS: Rewind Button is to the right of Play Button
+PASS: Timeline Box is to the right of Rewind Button
+PASS: Mute Box is to the right of Timeline Box
+PASS: Fullscreen Button is to the right of Mute Box
+
+Testing finished.
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/elementOrder-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsmediacontrolselementOrderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/elementOrder.html (0 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/elementOrder.html (rev 0)
+++ trunk/LayoutTests/media/controls/elementOrder.html 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../media-file.js"></script>
+ <script src="controls-test-helpers.js"></script>
+ <script>
+ var tester = new ControlsTest()
+ .whenReady(runTests)
+ .start();
+
+ function runTests()
+ {
+ currentState = tester.currentState;
+ tester.test("We are using the apple idiom")
+ .value(currentState.idiom)
+ .isEqualTo("apple");
+
+ var elementNames = ["Play Button", "Rewind Button", "Timeline Box", "Mute Box", "Fullscreen Button"];
+ var previousElementName = "";
+ var previousLeftValue = 0;
+
+ elementNames.forEach(function (name) {
+ var elementState = tester.stateForControlsElement(name);
+ var leftValue = elementState.bounds.left;
+ if (previousElementName && previousLeftValue) {
+ tester.test(`${name} is to the right of ${previousElementName}`)
+ .value(elementState.bounds.left)
+ .isGreaterThan(previousLeftValue);
+ }
+ previousElementName = name;
+ previousLeftValue = leftValue;
+ });
+
+ tester.end();
+ }
+
+ </script>
+ </head>
+ <body>
+ <p>This tests for the content in the status display.</p>
+ <p>This test only runs in DRT!</p>
+ <video controls></video>
+ </body>
+</html>
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/elementOrder.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189358 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-04 18:12:16 UTC (rev 189358)
+++ trunk/Source/WebCore/ChangeLog 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-04 Dean Jackson <dino@apple.com>
+
+ [mediacontrols] Test the ordering of elements in the controls panel
+ https://bugs.webkit.org/show_bug.cgi?id=148804
+ <rdar://problem/22579232>
+
+ Reviewed by Eric Carlson.
+
+ Add information about various controls elements to the status object.
+
+ Test: media/controls/elementOrder.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+
</ins><span class="cx"> 2015-09-03 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [mediacontrols] Expose bounding rectangles and computed style to testing
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (189358 => 189359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-09-04 18:12:16 UTC (rev 189358)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-09-04 18:12:21 UTC (rev 189359)
</span><span class="lines">@@ -2112,6 +2112,26 @@
</span><span class="cx"> object: this.controls.statusDisplay,
</span><span class="cx"> styleValues: ["display"],
</span><span class="cx"> extraProperties: ["textContent"]
</span><ins>+ },
+ {
+ name: "Play Button",
+ object: this.controls.playButton
+ },
+ {
+ name: "Rewind Button",
+ object: this.controls.rewindButton
+ },
+ {
+ name: "Timeline Box",
+ object: this.controls.timelineBox
+ },
+ {
+ name: "Mute Box",
+ object: this.controls.muteBox
+ },
+ {
+ name: "Fullscreen Button",
+ object: this.controls.fullscreenButton
</ins><span class="cx"> }
</span><span class="cx"> ];
</span><span class="cx">
</span><span class="lines">@@ -2125,16 +2145,18 @@
</span><span class="cx"> element.styleValues.forEach(function (propertyName) {
</span><span class="cx"> element.computedStyle[propertyName] = computedStyle[propertyName];
</span><span class="cx"> });
</span><ins>+ delete element.styleValues;
</ins><span class="cx"> }
</span><del>- delete element.styleValues;
</del><span class="cx">
</span><span class="cx"> element.bounds = obj.getBoundingClientRect();
</span><span class="cx"> element.className = obj.className;
</span><span class="cx">
</span><del>- element.extraProperties.forEach(function (property) {
- element[property] = obj[property];
- });
- delete element.extraProperties;
</del><ins>+ if (element.extraProperties) {
+ element.extraProperties.forEach(function (property) {
+ element[property] = obj[property];
+ });
+ delete element.extraProperties;
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> result.elements = elements;
</span></span></pre>
</div>
</div>
</body>
</html>