<!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>[171032] 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/171032">171032</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-12 15:14:44 -0700 (Sat, 12 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] update control type when playback state changes
https://bugs.webkit.org/show_bug.cgi?id=134856
Reviewed by Dean Jackson.
Check to make sure the correct type of media controls are showing when playback state
changes so we don't end up with the wrong type of controls during playback.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.HandledVideoEvents): Drive-by fix, call handlePlay on 'playing' instead
of 'play' so controls don't hide too early.
* Modules/mediacontrols/mediaControlsiOS.js:
(ControllerIOS.prototype.setPlaying): New, call updateControls to make sure inline
controls are shown when appropriate.</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="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171031 => 171032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-12 21:55:57 UTC (rev 171031)
+++ trunk/Source/WebCore/ChangeLog 2014-07-12 22:14:44 UTC (rev 171032)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-12 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] update control type when playback state changes
+ https://bugs.webkit.org/show_bug.cgi?id=134856
+
+ Reviewed by Dean Jackson.
+
+ Check to make sure the correct type of media controls are showing when playback state
+ changes so we don't end up with the wrong type of controls during playback.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.HandledVideoEvents): Drive-by fix, call handlePlay on 'playing' instead
+ of 'play' so controls don't hide too early.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.setPlaying): New, call updateControls to make sure inline
+ controls are shown when appropriate.
+
</ins><span class="cx"> 2014-07-12 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS Media] Start playback button should indicate when it can't play
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (171031 => 171032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-07-12 21:55:57 UTC (rev 171031)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-07-12 22:14:44 UTC (rev 171032)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> canplaythrough: 'handleReadyStateChange',
</span><span class="cx"> timeupdate: 'handleTimeUpdate',
</span><span class="cx"> durationchange: 'handleDurationChange',
</span><del>- play: 'handlePlay',
</del><ins>+ playing: 'handlePlay',
</ins><span class="cx"> pause: 'handlePause',
</span><span class="cx"> progress: 'handleProgress',
</span><span class="cx"> volumechange: 'handleVolumeChange',
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (171031 => 171032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-07-12 21:55:57 UTC (rev 171031)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-07-12 22:14:44 UTC (rev 171032)
</span><span class="lines">@@ -439,6 +439,12 @@
</span><span class="cx"> Controller.prototype.updateStatusDisplay.call(this, event);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ setPlaying: function(isPlaying)
+ {
+ this.updateControls();
+ Controller.prototype.setPlaying.call(this, isPlaying);
+ },
+
</ins><span class="cx"> get pageScaleFactor() {
</span><span class="cx"> return this._pageScaleFactor;
</span><span class="cx"> },
</span></span></pre>
</div>
</div>
</body>
</html>