<!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>[189214] 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/189214">189214</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-09-01 10:38:56 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[mediacontrols] Add a test for the show controls button
https://bugs.webkit.org/show_bug.cgi?id=148655
<rdar://problem/22509688>
Reviewed by Eric Carlson.
Source/WebCore:
We'll add a list of control elements to the status object,
so we can query the state of buttons, etc. Begin with the
Show Controls button (used for accessibility).
There are also some drive-by whitespace changes.
Test: media/controls/showControlsButton.html
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.get idiom): Differentiate between iOS and
OS X. This isn't necessary at the moment, but will come in
handy later.
(Controller.prototype.createControls): Whitespace.
(Controller.prototype.getCurrentControlsStatus): Add the information
on the Show Controls button.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.get idiom):
LayoutTests:
* media/controls/controls-test-helpers.js: Added. This will
hold any helper functions.
(statusForControlsElement): Return the status object for
a named control.
* media/controls/showControlsButton-expected.txt: Added.
* media/controls/showControlsButton.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontrolscontrolstesthelpersjs">trunk/LayoutTests/media/controls/controls-test-helpers.js</a></li>
<li><a href="#trunkLayoutTestsmediacontrolsshowControlsButtonexpectedtxt">trunk/LayoutTests/media/controls/showControlsButton-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediacontrolsshowControlsButtonhtml">trunk/LayoutTests/media/controls/showControlsButton.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189213 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-01 17:37:16 UTC (rev 189213)
+++ trunk/LayoutTests/ChangeLog 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-08-31 Dean Jackson <dino@apple.com>
+
+ [mediacontrols] Add a test for the show controls button
+ https://bugs.webkit.org/show_bug.cgi?id=148655
+ <rdar://problem/22509688>
+
+ Reviewed by Eric Carlson.
+
+ * media/controls/controls-test-helpers.js: Added. This will
+ hold any helper functions.
+ (statusForControlsElement): Return the status object for
+ a named control.
+ * media/controls/showControlsButton-expected.txt: Added.
+ * media/controls/showControlsButton.html: Added.
+
</ins><span class="cx"> 2015-09-01 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add TestSuite hooks for per-testcase setup and teardown actions
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolscontrolstesthelpersjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/controls-test-helpers.js (0 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/controls-test-helpers.js (rev 0)
+++ trunk/LayoutTests/media/controls/controls-test-helpers.js 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+function statusForControlsElement(statusObject, elementName)
+{
+ if (statusObject.elements && statusObject.elements.length) {
+ for (var i = 0; i < statusObject.elements.length; i++) {
+ if (statusObject.elements[i].name == elementName)
+ return statusObject.elements[i];
+ }
+ }
+ return null;
+}
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/controls-test-helpers.js
</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="trunkLayoutTestsmediacontrolsshowControlsButtonexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/showControlsButton-expected.txt (0 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/showControlsButton-expected.txt (rev 0)
+++ trunk/LayoutTests/media/controls/showControlsButton-expected.txt 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+This tests for the existence of a hidden Show Controls button.
+
+This test only runs in DRT!
+
+
+EVENT(canplaythrough)
+EXPECTED (showControlsButtonInfo.name == 'Show Controls') OK
+EXPECTED (showControlsButtonInfo.hidden == 'true') OK
+END OF TEST
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/media/controls/showControlsButton-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="trunkLayoutTestsmediacontrolsshowControlsButtonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls/showControlsButton.html (0 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls/showControlsButton.html (rev 0)
+++ trunk/LayoutTests/media/controls/showControlsButton.html 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <script src="../media-file.js"></script>
+ <script src="../video-test.js"></script>
+ <script src="controls-test-helpers.js"></script>
+ <script>
+ var video;
+ var currentStatus;
+ var showControlsButtonInfo;
+
+ function init()
+ {
+ findMediaElement();
+ video.src = findMediaFile("video", "../content/test");
+
+ waitForEvent("canplaythrough", canplaythrough);
+ waitForEventAndFail("error");
+ }
+
+ function canplaythrough()
+ {
+ if (!window.testRunner)
+ return;
+
+ currentStatus = JSON.parse(internals.getCurrentMediaControlsStatusForElement(video));
+ if (currentStatus) {
+ if (currentStatus.idiom == "apple") {
+ showControlsButtonInfo = statusForControlsElement(currentStatus, "Show Controls");
+ if (showControlsButtonInfo) {
+ testExpected("showControlsButtonInfo.name", "Show Controls");
+ testExpected("showControlsButtonInfo.hidden", true);
+ }
+ }
+ }
+ endTest();
+ }
+ </script>
+ </head>
+ <body onload="init()">
+ <p>This tests for the existence of a hidden Show Controls button.</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/showControlsButton.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 (189213 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-01 17:37:16 UTC (rev 189213)
+++ trunk/Source/WebCore/ChangeLog 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-08-31 Dean Jackson <dino@apple.com>
+
+ [mediacontrols] Add a test for the show controls button
+ https://bugs.webkit.org/show_bug.cgi?id=148655
+ <rdar://problem/22509688>
+
+ Reviewed by Eric Carlson.
+
+ We'll add a list of control elements to the status object,
+ so we can query the state of buttons, etc. Begin with the
+ Show Controls button (used for accessibility).
+
+ There are also some drive-by whitespace changes.
+
+ Test: media/controls/showControlsButton.html
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.get idiom): Differentiate between iOS and
+ OS X. This isn't necessary at the moment, but will come in
+ handy later.
+ (Controller.prototype.createControls): Whitespace.
+ (Controller.prototype.getCurrentControlsStatus): Add the information
+ on the Show Controls button.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.get idiom):
+
</ins><span class="cx"> 2015-09-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Possible CFArray leak in MediaPlayerPrivateAVFoundationCF.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (189213 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-09-01 17:37:16 UTC (rev 189213)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -144,6 +144,11 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get idiom()
+ {
+ return "apple";
+ },
+
</ins><span class="cx"> UIString: function(developmentString, replaceString, replacementString)
</span><span class="cx"> {
</span><span class="cx"> var localized = UIStringTable[developmentString];
</span><span class="lines">@@ -336,10 +341,10 @@
</span><span class="cx"> this.listenFor(panel, 'click', this.handlePanelClick);
</span><span class="cx"> this.listenFor(panel, 'dblclick', this.handlePanelClick);
</span><span class="cx"> this.listenFor(panel, 'dragstart', this.handlePanelDragStart);
</span><del>-
</del><ins>+
</ins><span class="cx"> var panelBackgroundContainer = this.controls.panelBackgroundContainer = document.createElement('div');
</span><span class="cx"> panelBackgroundContainer.setAttribute('pseudo', '-webkit-media-controls-panel-background-container');
</span><del>-
</del><ins>+
</ins><span class="cx"> var panelTint = this.controls.panelTint = document.createElement('div');
</span><span class="cx"> panelTint.setAttribute('pseudo', '-webkit-media-controls-panel-tint');
</span><span class="cx"> this.listenFor(panelTint, 'mousedown', this.handlePanelMouseDown);
</span><span class="lines">@@ -401,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> this.timelineContextName = "_webkit-media-controls-timeline-" + this.host.generateUUID();
</span><span class="cx"> timeline.style.backgroundImage = '-webkit-canvas(' + this.timelineContextName + ')';
</span><del>-
</del><ins>+
</ins><span class="cx"> var thumbnailTrack = this.controls.thumbnailTrack = document.createElement('div');
</span><span class="cx"> thumbnailTrack.classList.add(this.ClassNames.thumbnailTrack);
</span><span class="cx">
</span><span class="lines">@@ -438,10 +443,10 @@
</span><span class="cx"> var volumeBox = this.controls.volumeBox = document.createElement('div');
</span><span class="cx"> volumeBox.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container');
</span><span class="cx"> volumeBox.classList.add(this.ClassNames.volumeBox);
</span><del>-
</del><ins>+
</ins><span class="cx"> var volumeBoxBackground = this.controls.volumeBoxBackground = document.createElement('div');
</span><span class="cx"> volumeBoxBackground.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container-background');
</span><del>-
</del><ins>+
</ins><span class="cx"> var volumeBoxTint = this.controls.volumeBoxTint = document.createElement('div');
</span><span class="cx"> volumeBoxTint.setAttribute('pseudo', '-webkit-media-controls-volume-slider-container-tint');
</span><span class="cx">
</span><span class="lines">@@ -458,7 +463,7 @@
</span><span class="cx">
</span><span class="cx"> this.volumeContextName = "_webkit-media-controls-volume-" + this.host.generateUUID();
</span><span class="cx"> volume.style.backgroundImage = '-webkit-canvas(' + this.volumeContextName + ')';
</span><del>-
</del><ins>+
</ins><span class="cx"> var captionButton = this.controls.captionButton = document.createElement('button');
</span><span class="cx"> captionButton.setAttribute('pseudo', '-webkit-media-controls-toggle-closed-captions-button');
</span><span class="cx"> captionButton.setAttribute('aria-label', this.UIString('Captions'));
</span><span class="lines">@@ -483,10 +488,10 @@
</span><span class="cx">
</span><span class="cx"> var inlinePlaybackPlaceholderText = this.controls.inlinePlaybackPlaceholderText = document.createElement('div');
</span><span class="cx"> inlinePlaybackPlaceholderText.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-text');
</span><del>-
</del><ins>+
</ins><span class="cx"> var inlinePlaybackPlaceholderTextTop = this.controls.inlinePlaybackPlaceholderTextTop = document.createElement('p');
</span><span class="cx"> inlinePlaybackPlaceholderTextTop.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-text-top');
</span><del>-
</del><ins>+
</ins><span class="cx"> var inlinePlaybackPlaceholderTextBottom = this.controls.inlinePlaybackPlaceholderTextBottom = document.createElement('p');
</span><span class="cx"> inlinePlaybackPlaceholderTextBottom.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-text-bottom');
</span><span class="cx">
</span><span class="lines">@@ -2092,7 +2097,15 @@
</span><span class="cx"> getCurrentControlsStatus: function ()
</span><span class="cx"> {
</span><span class="cx"> return JSON.stringify({
</span><del>- status: "ok"
</del><ins>+ idiom: this.idiom,
+ status: "ok",
+ elements: [
+ {
+ name: "Show Controls",
+ className: this.showControlsButton.className,
+ hidden: this.showControlsButton.hidden
+ }
+ ]
</ins><span class="cx"> });
</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 (189213 => 189214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-09-01 17:37:16 UTC (rev 189213)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-09-01 17:38:56 UTC (rev 189214)
</span><span class="lines">@@ -30,6 +30,11 @@
</span><span class="cx"> MinimumTimelineWidth: 200,
</span><span class="cx"> ButtonWidth: 42,
</span><span class="cx">
</span><ins>+ get idiom()
+ {
+ return "ios";
+ },
+
</ins><span class="cx"> addVideoListeners: function() {
</span><span class="cx"> Controller.prototype.addVideoListeners.call(this);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>