<!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>[185519] 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/185519">185519</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-06-12 13:41:36 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] AirPlay menu button doesn't always show on page load
https://bugs.webkit.org/show_bug.cgi?id=145936
Reviewed by Brent Fulgham.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::mediaProducerStateString): New, return a string representing MediaStateFlags.
(WebCore::WebMediaSessionManager::clientStateDidChange): Log the states as strings.
(WebCore::WebMediaSessionManager::toString): New, return a string representing ConfigurationTasks.
(WebCore::WebMediaSessionManager::scheduleDelayedTask): Add logging.
(WebCore::WebMediaSessionManager::taskTimerFired): Add logging.
* Modules/mediasession/WebMediaSessionManager.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h: Override wirelessVideoPlaybackDisabled
so it is possible to activate route monitoring for a movie loaded with this engine.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh">trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185518 => 185519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-12 18:48:53 UTC (rev 185518)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 20:41:36 UTC (rev 185519)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-06-12 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] AirPlay menu button doesn't always show on page load
+ https://bugs.webkit.org/show_bug.cgi?id=145936
+
+ Reviewed by Brent Fulgham.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::mediaProducerStateString): New, return a string representing MediaStateFlags.
+ (WebCore::WebMediaSessionManager::clientStateDidChange): Log the states as strings.
+ (WebCore::WebMediaSessionManager::toString): New, return a string representing ConfigurationTasks.
+ (WebCore::WebMediaSessionManager::scheduleDelayedTask): Add logging.
+ (WebCore::WebMediaSessionManager::taskTimerFired): Add logging.
+ * Modules/mediasession/WebMediaSessionManager.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h: Override wirelessVideoPlaybackDisabled
+ so it is possible to activate route monitoring for a movie loaded with this engine.
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h: Ditto.
+
</ins><span class="cx"> 2015-06-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add the remaining missing override specifiers under Source/WebCore/
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (185518 => 185519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-06-12 18:48:53 UTC (rev 185518)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-06-12 20:41:36 UTC (rev 185519)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MediaPlaybackTargetPickerMac.h"
</span><span class="cx"> #include "WebMediaSessionManagerClient.h"
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -61,6 +62,29 @@
</span><span class="cx"> return value & flags;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+static String mediaProducerStateString(MediaProducer::MediaStateFlags flags)
+{
+ StringBuilder string;
+ if (flags & MediaProducer::IsPlayingAudio)
+ string.append("IsPlayingAudio + ");
+ if (flags & MediaProducer::IsPlayingVideo)
+ string.append("IsPlayingVideo + ");
+ if (flags & MediaProducer::IsPlayingToExternalDevice)
+ string.append("IsPlayingToExternalDevice + ");
+ if (flags & MediaProducer::RequiresPlaybackTargetMonitoring)
+ string.append("RequiresPlaybackTargetMonitoring + ");
+ if (flags & MediaProducer::ExternalDeviceAutoPlayCandidate)
+ string.append("ExternalDeviceAutoPlayCandidate + ");
+ if (string.isEmpty())
+ string.append("IsNotPlaying");
+ else
+ string.resize(string.length() - 2);
+
+ return string.toString();
+}
+#endif
+
</ins><span class="cx"> WebMediaSessionManager::WebMediaSessionManager()
</span><span class="cx"> : m_taskTimer(RunLoop::current(), this, &WebMediaSessionManager::taskTimerFired)
</span><span class="cx"> {
</span><span class="lines">@@ -136,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> auto& changedClientState = m_clientState[index];
</span><span class="cx"> MediaProducer::MediaStateFlags oldFlags = changedClientState->flags;
</span><del>- LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = 0x%x, old flags = 0x%x", &client, contextId, newFlags, oldFlags);
</del><ins>+ LOG(Media, "WebMediaSessionManager::clientStateDidChange(%p + %llu) - new flags = %s, old flags = %s", &client, contextId, mediaProducerStateString(newFlags).utf8().data(), mediaProducerStateString(oldFlags).utf8().data());
</ins><span class="cx"> if (newFlags == oldFlags)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -265,14 +289,37 @@
</span><span class="cx"> targetPicker().stopMonitoringPlaybackTargets();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !LOG_DISABLED
+String WebMediaSessionManager::toString(ConfigurationTasks tasks)
+{
+ StringBuilder string;
+ if (tasks & InitialConfigurationTask)
+ string.append("InitialConfigurationTask + ");
+ if (tasks & TargetClientsConfigurationTask)
+ string.append("TargetClientsConfigurationTask + ");
+ if (tasks & TargetMonitoringConfigurationTask)
+ string.append("TargetMonitoringConfigurationTask + ");
+ if (string.isEmpty())
+ string.append("NoTask");
+ else
+ string.resize(string.length() - 2);
+
+ return string.toString();
+}
+#endif
+
</ins><span class="cx"> void WebMediaSessionManager::scheduleDelayedTask(ConfigurationTasks tasks)
</span><span class="cx"> {
</span><ins>+ LOG(Media, "WebMediaSessionManager::scheduleDelayedTask - tasks = %s", toString(tasks).utf8().data());
+
</ins><span class="cx"> m_taskFlags |= tasks;
</span><span class="cx"> m_taskTimer.startOneShot(taskDelayInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::taskTimerFired()
</span><span class="cx"> {
</span><ins>+ LOG(Media, "WebMediaSessionManager::taskTimerFired - tasks = %s", toString(m_taskFlags).utf8().data());
+
</ins><span class="cx"> if (m_taskFlags & InitialConfigurationTask)
</span><span class="cx"> configureNewClients();
</span><span class="cx"> if (m_taskFlags & TargetClientsConfigurationTask)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h (185518 => 185519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-06-12 18:48:53 UTC (rev 185518)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.h 2015-06-12 20:41:36 UTC (rev 185519)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> TargetMonitoringConfigurationTask = 1 << 2,
</span><span class="cx"> };
</span><span class="cx"> typedef unsigned ConfigurationTasks;
</span><ins>+ String toString(ConfigurationTasks);
</ins><span class="cx">
</span><span class="cx"> void scheduleDelayedTask(ConfigurationTasks);
</span><span class="cx"> void taskTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (185518 => 185519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-06-12 18:48:53 UTC (rev 185518)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-06-12 20:41:36 UTC (rev 185519)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx"> virtual bool isCurrentPlaybackTargetWireless() const override;
</span><span class="cx"> virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</span><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><ins>+ bool wirelessVideoPlaybackDisabled() const override { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void ensureLayer();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (185518 => 185519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-06-12 18:48:53 UTC (rev 185518)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-06-12 20:41:36 UTC (rev 185519)
</span><span class="lines">@@ -183,6 +183,7 @@
</span><span class="cx"> virtual bool isCurrentPlaybackTargetWireless() const override;
</span><span class="cx"> virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</span><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><ins>+ bool wirelessVideoPlaybackDisabled() const override { return false; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span></span></pre>
</div>
</div>
</body>
</html>