<!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>[199603] 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/199603">199603</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-04-15 12:06:30 -0700 (Fri, 15 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Audio elements should be able to have a controls manager.
https://bugs.webkit.org/show_bug.cgi?id=156630
Reviewed by Beth Dakin.
Now that there is no longer a architectural restriction about what kind of media elements
can be used with WebPlaybackSessionManager, allow audio elements to create a controls
manager.
Drive-by fix: clear the controls manager when destroying the media player due to entering
the page cache, and when destroying the media element.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::~HTMLMediaElement):
(WebCore::HTMLMediaElement::updatePlayState):
(WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::canControlControlsManager):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessioncpp">trunk/Source/WebCore/html/MediaElementSession.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199602 => 199603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-15 19:01:39 UTC (rev 199602)
+++ trunk/Source/WebCore/ChangeLog 2016-04-15 19:06:30 UTC (rev 199603)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-04-15 Jer Noble <jer.noble@apple.com>
+
+ Audio elements should be able to have a controls manager.
+ https://bugs.webkit.org/show_bug.cgi?id=156630
+
+ Reviewed by Beth Dakin.
+
+ Now that there is no longer a architectural restriction about what kind of media elements
+ can be used with WebPlaybackSessionManager, allow audio elements to create a controls
+ manager.
+
+ Drive-by fix: clear the controls manager when destroying the media player due to entering
+ the page cache, and when destroying the media element.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::~HTMLMediaElement):
+ (WebCore::HTMLMediaElement::updatePlayState):
+ (WebCore::HTMLMediaElement::stopWithoutDestroyingMediaPlayer):
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::canControlControlsManager):
+
</ins><span class="cx"> 2016-04-15 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Calling SVGAnimatedPropertyTearOff::animationEnded() will crash if the SVG property is not animating
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (199602 => 199603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-15 19:01:39 UTC (rev 199602)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-04-15 19:06:30 UTC (rev 199603)
</span><span class="lines">@@ -499,6 +499,9 @@
</span><span class="cx"> setShouldDelayLoadEvent(false);
</span><span class="cx"> unregisterWithDocument(document());
</span><span class="cx">
</span><ins>+ if (document().page())
+ document().page()->chrome().client().clearPlaybackControlsManager(*this);
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> if (m_audioTracks) {
</span><span class="cx"> m_audioTracks->clearElement();
</span><span class="lines">@@ -4824,10 +4827,8 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::updatePlayState(%p) - shouldBePlaying = %s, playerPaused = %s", this, boolString(shouldBePlaying), boolString(playerPaused));
</span><span class="cx">
</span><span class="cx"> if (shouldBePlaying) {
</span><del>- if (document().page() && m_mediaSession->canControlControlsManager(*this)) {
- HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
- document().page()->chrome().client().setUpPlaybackControlsManager(asVideo);
- }
</del><ins>+ if (document().page() && m_mediaSession->canControlControlsManager(*this))
+ document().page()->chrome().client().setUpPlaybackControlsManager(*this);
</ins><span class="cx">
</span><span class="cx"> setDisplayMode(Video);
</span><span class="cx"> invalidateCachedTime();
</span><span class="lines">@@ -4861,7 +4862,7 @@
</span><span class="cx"> startPlaybackProgressTimer();
</span><span class="cx"> setPlaying(true);
</span><span class="cx"> } else {
</span><del>- if (endedPlayback() && document().page() && is<HTMLVideoElement>(*this))
</del><ins>+ if (endedPlayback() && document().page())
</ins><span class="cx"> document().page()->chrome().client().clearPlaybackControlsManager(*this);
</span><span class="cx">
</span><span class="cx"> if (!playerPaused)
</span><span class="lines">@@ -5030,7 +5031,10 @@
</span><span class="cx">
</span><span class="cx"> if (m_videoFullscreenMode != VideoFullscreenModeNone)
</span><span class="cx"> exitFullscreen();
</span><del>-
</del><ins>+
+ if (document().page())
+ document().page()->chrome().client().clearPlaybackControlsManager(*this);
+
</ins><span class="cx"> m_inActiveDocument = false;
</span><span class="cx">
</span><span class="cx"> // Stop the playback without generating events
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (199602 => 199603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-15 19:01:39 UTC (rev 199602)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-04-15 19:06:30 UTC (rev 199603)
</span><span class="lines">@@ -214,9 +214,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaElementSession::canControlControlsManager(const HTMLMediaElement& element) const
</span><span class="cx"> {
</span><del>- // FIXME: rdar://problem/25537071 Audio elements should be able to have a controls manager as well.
- // Audio elements should probably only have a controls manager if they started playing via a user gesture.
- if (!element.isVideo())
</del><ins>+ if (!element.hasAudio())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!playbackPermitted(element))
</span><span class="lines">@@ -226,10 +224,8 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (renderer->clientWidth() >= elementMainContentMinimumWidth && renderer->clientHeight() >= elementMainContentMinimumHeight) {
- if (element.hasAudio() && element.hasVideo())
</del><ins>+ if (element.hasVideo() && renderer->clientWidth() >= elementMainContentMinimumWidth && renderer->clientHeight() >= elementMainContentMinimumHeight)
</ins><span class="cx"> return true;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (ScriptController::processingUserGestureForMedia())
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>