<!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>[202425] trunk/Source</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/202425">202425</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-06-24 10:12:10 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Playback controls refer to wrong element when playing multiple items in a page.
https://bugs.webkit.org/show_bug.cgi?id=159076
<rdar://problem/26953532>
Reviewed by Beth Dakin.
Source/WebCore:
Use a new method PlatformMediaSessionManager::currentSessionMatching() to get
the most recently active media element which qualifies for playback controls.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updatePlaybackControlsManager): Get the most recently active session.
* html/MediaElementSession.cpp:
(WebCore::MediaElementSession::canControlControlsManager): Make virtual; no longer takes an element.
* html/MediaElementSession.h:
(isType): Allow downcasting from PlatformMediaSession -> MediaElementSession.
* page/ChromeClient.h:
* platform/audio/PlatformMediaSession.h:
(WebCore::PlatformMediaSession::canControlControlsManager): Defaults to false;
* platform/audio/PlatformMediaSessionManager.cpp:
(WebCore::PlatformMediaSessionManager::currentSessionMatching): Added.
* platform/audio/PlatformMediaSessionManager.h:
Source/WebKit/mac:
clearPlaybackControlsManager() no longer takes a parameter.
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::clearPlaybackControlsManager):
* WebView/WebView.mm:
(-[WebView _clearPlaybackControlsManager]): Renamed from _clearPlaybackControlsManagerForMediaElement:.
* WebView/WebViewInternal.h:
Source/WebKit2:
clearPlaybackControlsManager() no longer takes a parameter.
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::clearPlaybackControlsManager):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/cocoa/WebPlaybackSessionManager.h:
* WebProcess/cocoa/WebPlaybackSessionManager.mm:
(WebKit::WebPlaybackSessionManager::setUpPlaybackControlsManager): Make sure to removeClientForContext()
if the old context refers to a live media element.
(WebKit::WebPlaybackSessionManager::clearPlaybackControlsManager):</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>
<li><a href="#trunkSourceWebCorehtmlMediaElementSessionh">trunk/Source/WebCore/html/MediaElementSession.h</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionh">trunk/Source/WebCore/platform/audio/PlatformMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh">trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebChromeClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewInternalh">trunk/Source/WebKit/mac/WebView/WebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagerh">trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm">trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-24 Jer Noble <jer.noble@apple.com>
+
+ Playback controls refer to wrong element when playing multiple items in a page.
+ https://bugs.webkit.org/show_bug.cgi?id=159076
+ <rdar://problem/26953532>
+
+ Reviewed by Beth Dakin.
+
+ Use a new method PlatformMediaSessionManager::currentSessionMatching() to get
+ the most recently active media element which qualifies for playback controls.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updatePlaybackControlsManager): Get the most recently active session.
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::canControlControlsManager): Make virtual; no longer takes an element.
+ * html/MediaElementSession.h:
+ (isType): Allow downcasting from PlatformMediaSession -> MediaElementSession.
+ * page/ChromeClient.h:
+ * platform/audio/PlatformMediaSession.h:
+ (WebCore::PlatformMediaSession::canControlControlsManager): Defaults to false;
+ * platform/audio/PlatformMediaSessionManager.cpp:
+ (WebCore::PlatformMediaSessionManager::currentSessionMatching): Added.
+ * platform/audio/PlatformMediaSessionManager.h:
+
</ins><span class="cx"> 2016-06-24 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the macOS build.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -7090,10 +7090,14 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_mediaSession->canControlControlsManager(*this))
- page->chrome().client().setUpPlaybackControlsManager(*this);
</del><ins>+ PlatformMediaSession* session = PlatformMediaSessionManager::sharedManager().currentSessionMatching([] (const PlatformMediaSession& session) {
+ return session.canControlControlsManager();
+ });
+
+ if (!is<MediaElementSession>(session))
+ page->chrome().client().clearPlaybackControlsManager();
</ins><span class="cx"> else
</span><del>- page->chrome().client().clearPlaybackControlsManager(*this);
</del><ins>+ page->chrome().client().setUpPlaybackControlsManager(downcast<MediaElementSession>(session)->element());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::shouldOverrideBackgroundLoadingRestriction() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -211,45 +211,45 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaElementSession::canControlControlsManager(const HTMLMediaElement& element) const
</del><ins>+bool MediaElementSession::canControlControlsManager() const
</ins><span class="cx"> {
</span><del>- if (!element.hasAudio()) {
</del><ins>+ if (!m_element.hasAudio()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No audio");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.muted()) {
</del><ins>+ if (m_element.muted()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Muted");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.ended()) {
</del><ins>+ if (m_element.ended()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Ended");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.document().activeDOMObjectsAreSuspended()) {
</del><ins>+ if (m_element.document().activeDOMObjectsAreSuspended()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: activeDOMObjectsAreSuspended()");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!playbackPermitted(element)) {
</del><ins>+ if (!playbackPermitted(m_element)) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Playback not permitted");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element.isVideo()) {
- if (!element.renderer()) {
</del><ins>+ if (m_element.isVideo()) {
+ if (!m_element.renderer()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No renderer");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!element.hasVideo()) {
</del><ins>+ if (!m_element.hasVideo()) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No video");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isElementLargeEnoughForMainContent(element)) {
</del><ins>+ if (isElementLargeEnoughForMainContent(m_element)) {
</ins><span class="cx"> LOG(Media, "MediaElementSession::canControlControlsManager - returning TRUE: Is main content");
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaElementSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaElementSession.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaElementSession.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/html/MediaElementSession.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "MediaPlayer.h"
</span><span class="cx"> #include "PlatformMediaSession.h"
</span><span class="cx"> #include "Timer.h"
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -53,7 +54,7 @@
</span><span class="cx"> bool pageAllowsDataLoading(const HTMLMediaElement&) const;
</span><span class="cx"> bool pageAllowsPlaybackAfterResuming(const HTMLMediaElement&) const;
</span><span class="cx">
</span><del>- bool canControlControlsManager(const HTMLMediaElement&) const;
</del><ins>+ bool canControlControlsManager() const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void showPlaybackTargetPicker(const HTMLMediaElement&);
</span><span class="lines">@@ -107,6 +108,8 @@
</span><span class="cx"> size_t maximumMediaSourceBufferSize(const SourceBuffer&) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ HTMLMediaElement& element() const { return m_element; }
+
</ins><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="lines">@@ -142,6 +145,10 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // MediaElementSession_h
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::MediaElementSession)
+static bool isType(const WebCore::PlatformMediaSession& session) { return session.mediaType() == WebCore::PlatformMediaSession::Video || session.mediaType() == WebCore::PlatformMediaSession::Audio; }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span><ins>+
+#endif // MediaElementSession_h
</ins></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/page/ChromeClient.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual void enterVideoFullscreenForVideoElement(HTMLVideoElement&, HTMLMediaElementEnums::VideoFullscreenMode) { }
</span><span class="cx"> virtual void setUpPlaybackControlsManager(HTMLMediaElement&) { }
</span><del>- virtual void clearPlaybackControlsManager(HTMLMediaElement&) { }
</del><ins>+ virtual void clearPlaybackControlsManager() { }
</ins><span class="cx"> #endif
</span><span class="cx"> virtual void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) { }
</span><span class="cx"> virtual void exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement&, HTMLMediaElementEnums::VideoFullscreenMode /*targetMode*/) { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldOverrideBackgroundLoadingRestriction() const;
</span><span class="cx">
</span><ins>+ virtual bool canControlControlsManager() const { return false; }
</ins><span class="cx"> virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
</span><span class="cx"> virtual bool isPlayingToWirelessPlaybackTarget() const { return m_isPlayingToWirelessPlaybackTarget; }
</span><span class="cx"> void isPlayingToWirelessPlaybackTargetChanged(bool);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -277,6 +277,15 @@
</span><span class="cx">
</span><span class="cx"> return m_sessions[0];
</span><span class="cx"> }
</span><ins>+
+PlatformMediaSession* PlatformMediaSessionManager::currentSessionMatching(std::function<bool(const PlatformMediaSession &)> filter)
+{
+ for (auto& session : m_sessions) {
+ if (filter(*session))
+ return session;
+ }
+ return nullptr;
+}
</ins><span class="cx">
</span><span class="cx"> bool PlatformMediaSessionManager::sessionCanLoadMedia(const PlatformMediaSession& session) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioPlatformMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -92,6 +92,8 @@
</span><span class="cx"> void setCurrentSession(PlatformMediaSession&);
</span><span class="cx"> PlatformMediaSession* currentSession();
</span><span class="cx">
</span><ins>+ PlatformMediaSession* currentSessionMatching(std::function<bool(const PlatformMediaSession&)>);
+
</ins><span class="cx"> void sessionIsPlayingToWirelessPlaybackTargetChanged(PlatformMediaSession&);
</span><span class="cx"> void sessionCanProduceAudioChanged(PlatformMediaSession&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-24 Jer Noble <jer.noble@apple.com>
+
+ Playback controls refer to wrong element when playing multiple items in a page.
+ https://bugs.webkit.org/show_bug.cgi?id=159076
+ <rdar://problem/26953532>
+
+ Reviewed by Beth Dakin.
+
+ clearPlaybackControlsManager() no longer takes a parameter.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::clearPlaybackControlsManager):
+ * WebView/WebView.mm:
+ (-[WebView _clearPlaybackControlsManager]): Renamed from _clearPlaybackControlsManagerForMediaElement:.
+ * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2016-06-23 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unused didCancelAuthenticationChallenge
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
</span><del>- void clearPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
</del><ins>+ void clearPlaybackControlsManager() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -939,9 +939,9 @@
</span><span class="cx"> [m_webView _setUpPlaybackControlsManagerForMediaElement:element];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::clearPlaybackControlsManager(HTMLMediaElement& element)
</del><ins>+void WebChromeClient::clearPlaybackControlsManager()
</ins><span class="cx"> {
</span><del>- [m_webView _clearPlaybackControlsManagerForMediaElement:element];
</del><ins>+ [m_webView _clearPlaybackControlsManager];
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -8612,9 +8612,9 @@
</span><span class="cx"> [self updateWebViewAdditions];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_clearPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement
</del><ins>+- (void)_clearPlaybackControlsManager
</ins><span class="cx"> {
</span><del>- if (!_private->playbackSessionModel || _private->playbackSessionModel->mediaElement() != &mediaElement)
</del><ins>+ if (!_private->playbackSessionModel || !_private->playbackSessionModel->mediaElement())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> _private->playbackSessionModel->setMediaElement(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewInternal.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit/mac/WebView/WebViewInternal.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> - (BOOL)_hasActiveVideoForControlsInterface;
</span><span class="cx"> - (void)_setUpPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement;
</span><del>-- (void)_clearPlaybackControlsManagerForMediaElement:(WebCore::HTMLMediaElement&)mediaElement;
</del><ins>+- (void)_clearPlaybackControlsManager;
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-06-24 Jer Noble <jer.noble@apple.com>
+
+ Playback controls refer to wrong element when playing multiple items in a page.
+ https://bugs.webkit.org/show_bug.cgi?id=159076
+ <rdar://problem/26953532>
+
+ Reviewed by Beth Dakin.
+
+ clearPlaybackControlsManager() no longer takes a parameter.
+
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::clearPlaybackControlsManager):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/cocoa/WebPlaybackSessionManager.h:
+ * WebProcess/cocoa/WebPlaybackSessionManager.mm:
+ (WebKit::WebPlaybackSessionManager::setUpPlaybackControlsManager): Make sure to removeClientForContext()
+ if the old context refers to a live media element.
+ (WebKit::WebPlaybackSessionManager::clearPlaybackControlsManager):
+
</ins><span class="cx"> 2016-06-24 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB tests crashing attempting to register sandbox extensions for blob files.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -856,9 +856,9 @@
</span><span class="cx"> m_page->playbackSessionManager().setUpPlaybackControlsManager(mediaElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::clearPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
</del><ins>+void WebChromeClient::clearPlaybackControlsManager()
</ins><span class="cx"> {
</span><del>- m_page->playbackSessionManager().clearPlaybackControlsManager(mediaElement);
</del><ins>+ m_page->playbackSessionManager().clearPlaybackControlsManager();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> #if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
</span><span class="cx"> bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
</span><del>- void clearPlaybackControlsManager(WebCore::HTMLMediaElement&) override;
</del><ins>+ void clearPlaybackControlsManager() override;
</ins><span class="cx"> void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
</span><span class="cx"> void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.h 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) final;
</span><span class="cx">
</span><span class="cx"> void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&);
</span><del>- void clearPlaybackControlsManager(WebCore::HTMLMediaElement&);
</del><ins>+ void clearPlaybackControlsManager();
</ins><span class="cx"> uint64_t contextIdForMediaElement(WebCore::HTMLMediaElement&);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebPlaybackSessionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm (202424 => 202425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-06-24 17:05:46 UTC (rev 202424)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebPlaybackSessionManager.mm 2016-06-24 17:12:10 UTC (rev 202425)
</span><span class="lines">@@ -246,6 +246,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> auto addResult = m_mediaElements.ensure(&mediaElement, [&] { return nextContextId(); });
</span><span class="cx"> auto contextId = addResult.iterator->value;
</span><ins>+ if (m_controlsManagerContextId)
+ removeClientForContext(m_controlsManagerContextId);
</ins><span class="cx"> m_controlsManagerContextId = contextId;
</span><span class="cx"> ensureModel(contextId).setMediaElement(&mediaElement);
</span><span class="cx"> }
</span><span class="lines">@@ -255,16 +257,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPlaybackSessionManager::clearPlaybackControlsManager(WebCore::HTMLMediaElement& mediaElement)
</del><ins>+void WebPlaybackSessionManager::clearPlaybackControlsManager()
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- auto foundIterator = m_mediaElements.find(&mediaElement);
- if (foundIterator == m_mediaElements.end())
</del><ins>+ if (!m_controlsManagerContextId)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_controlsManagerContextId || m_controlsManagerContextId != foundIterator->value)
- return;
-
</del><span class="cx"> removeClientForContext(m_controlsManagerContextId);
</span><span class="cx"> m_controlsManagerContextId = 0;
</span><span class="cx"> m_page->send(Messages::WebPlaybackSessionManagerProxy::ClearPlaybackControlsManager(), m_page->pageID());
</span></span></pre>
</div>
</div>
</body>
</html>