<!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>[183560] 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/183560">183560</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-29 11:05:25 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Use new device picker menu API
https://bugs.webkit.org/show_bug.cgi?id=144392
Reviewed by Jer Noble.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Pass the route state to the picker.
* platform/graphics/MediaPlaybackTargetPicker.h:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
(WebCore::MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac): m_deviceChangeTimer -> m_pendingActionTimer.
(WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Ditto.
(WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Renamed from
outputeDeviceAvailabilityChangedTimerFired.
(WebCore::MediaPlaybackTargetPickerMac::availableDevicesDidChange): Use addPendingAction.
(WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker): Call new picker API if it is
available. New API returns true if a target is chosen, so call currentDeviceDidChange in that case.
(WebCore::MediaPlaybackTargetPickerMac::addPendingAction): New.
(WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Make asynchronous because it
can now be called from showPlaybackTargetPicker.
(WebCore::MediaPlaybackTargetPickerMac::outputeDeviceAvailabilityChangedTimerFired): Renamed
pendingActionTimerFired.
* platform/spi/cocoa/AVKitSPI.h: Add new SPI.</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="#trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh">trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaAVKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/ChangeLog 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-04-29 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Use new device picker menu API
+ https://bugs.webkit.org/show_bug.cgi?id=144392
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Pass the route state to the picker.
+ * platform/graphics/MediaPlaybackTargetPicker.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac): m_deviceChangeTimer -> m_pendingActionTimer.
+ (WebCore::MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac): Ditto.
+ (WebCore::MediaPlaybackTargetPickerMac::pendingActionTimerFired): Renamed from
+ outputeDeviceAvailabilityChangedTimerFired.
+ (WebCore::MediaPlaybackTargetPickerMac::availableDevicesDidChange): Use addPendingAction.
+ (WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker): Call new picker API if it is
+ available. New API returns true if a target is chosen, so call currentDeviceDidChange in that case.
+ (WebCore::MediaPlaybackTargetPickerMac::addPendingAction): New.
+ (WebCore::MediaPlaybackTargetPickerMac::currentDeviceDidChange): Make asynchronous because it
+ can now be called from showPlaybackTargetPicker.
+ (WebCore::MediaPlaybackTargetPickerMac::outputeDeviceAvailabilityChangedTimerFired): Renamed
+ pendingActionTimerFired.
+
+ * platform/spi/cocoa/AVKitSPI.h: Add new SPI.
+
</ins><span class="cx"> 2015-04-29 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Main resource loaded via 304 response becomes empty if reloaded by user
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMediaSessionManager::showPlaybackTargetPicker(WebMediaSessionManagerClient& client, uint64_t contextId, const IntRect& rect, bool isVideo)
</del><ins>+void WebMediaSessionManager::showPlaybackTargetPicker(WebMediaSessionManagerClient& client, uint64_t contextId, const IntRect& rect, bool)
</ins><span class="cx"> {
</span><span class="cx"> size_t index = find(&client, contextId);
</span><span class="cx"> ASSERT(index != notFound);
</span><span class="lines">@@ -124,7 +124,8 @@
</span><span class="cx"> for (auto& state : m_clientState)
</span><span class="cx"> state->requestedPicker = (state->contextId == contextId && state->client == &client);
</span><span class="cx">
</span><del>- targetPicker().showPlaybackTargetPicker(FloatRect(rect), isVideo);
</del><ins>+ bool hasActiveRoute = flagsAreSet(m_clientState[index]->flags, MediaProducer::IsPlayingToExternalDevice);
+ targetPicker().showPlaybackTargetPicker(FloatRect(rect), hasActiveRoute);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::clientStateDidChange(WebMediaSessionManagerClient& client, uint64_t contextId, MediaProducer::MediaStateFlags newFlags)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlaybackTargetPickerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~MediaPlaybackTargetPicker();
</span><span class="cx">
</span><del>- virtual void showPlaybackTargetPicker(const FloatRect&, bool);
</del><ins>+ virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute);
</ins><span class="cx"> virtual void startingMonitoringPlaybackTargets();
</span><span class="cx"> virtual void stopMonitoringPlaybackTargets();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<MediaPlaybackTargetPickerMac> create(MediaPlaybackTargetPicker::Client&);
</span><span class="cx">
</span><del>- virtual void showPlaybackTargetPicker(const FloatRect&, bool) override;
</del><ins>+ virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute) override;
</ins><span class="cx"> virtual void startingMonitoringPlaybackTargets() override;
</span><span class="cx"> virtual void stopMonitoringPlaybackTargets() override;
</span><span class="cx">
</span><span class="lines">@@ -55,11 +55,20 @@
</span><span class="cx"> explicit MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client&);
</span><span class="cx">
</span><span class="cx"> AVOutputDeviceMenuController *devicePicker();
</span><del>- void outputeDeviceAvailabilityChangedTimerFired();
</del><span class="cx">
</span><ins>+ enum ActionType {
+ OutputDeviceAvailabilityChanged = 1 << 0,
+ CurrentDeviceDidChange = 1 << 1,
+ };
+ typedef unsigned PendingActionFlags;
+
+ void addPendingAction(PendingActionFlags);
+ void pendingActionTimerFired();
+
+ PendingActionFlags m_pendingActionFlags { 0 };
</ins><span class="cx"> RetainPtr<AVOutputDeviceMenuController> m_outputDeviceMenuController;
</span><span class="cx"> RetainPtr<WebAVOutputDeviceMenuControllerHelper> m_outputDeviceMenuControllerDelegate;
</span><del>- RunLoop::Timer<MediaPlaybackTargetPickerMac> m_deviceChangeTimer;
</del><ins>+ RunLoop::Timer<MediaPlaybackTargetPickerMac> m_pendingActionTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlaybackTargetPickerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -50,6 +50,11 @@
</span><span class="cx"> static NSString *externalOutputDeviceAvailableKeyName = @"externalOutputDeviceAvailable";
</span><span class="cx"> static NSString *externalOutputDevicePickedKeyName = @"externalOutputDevicePicked";
</span><span class="cx">
</span><ins>+// FIXME: remove this once the headers are available.
+@interface AVOutputDeviceMenuController (ForwardDeclaration)
+- (BOOL)showMenuForRect:(NSRect)screenRect appearanceName:(NSString *)appearanceName allowReselectionOfSelectedOutputDevice:(BOOL)allowReselectionOfSelectedOutputDevice;
+@end
+
</ins><span class="cx"> @interface WebAVOutputDeviceMenuControllerHelper : NSObject {
</span><span class="cx"> MediaPlaybackTargetPickerMac* m_callback;
</span><span class="cx"> }
</span><span class="lines">@@ -69,23 +74,33 @@
</span><span class="cx"> MediaPlaybackTargetPickerMac::MediaPlaybackTargetPickerMac(MediaPlaybackTargetPicker::Client& client)
</span><span class="cx"> : MediaPlaybackTargetPicker(client)
</span><span class="cx"> , m_outputDeviceMenuControllerDelegate(adoptNS([[WebAVOutputDeviceMenuControllerHelper alloc] initWithCallback:this]))
</span><del>- , m_deviceChangeTimer(RunLoop::main(), this, &MediaPlaybackTargetPickerMac::outputeDeviceAvailabilityChangedTimerFired)
</del><ins>+ , m_pendingActionTimer(RunLoop::main(), this, &MediaPlaybackTargetPickerMac::pendingActionTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaPlaybackTargetPickerMac::~MediaPlaybackTargetPickerMac()
</span><span class="cx"> {
</span><del>- m_deviceChangeTimer.stop();
</del><ins>+ m_pendingActionTimer.stop();
</ins><span class="cx"> [m_outputDeviceMenuControllerDelegate clearCallback];
</span><span class="cx"> stopMonitoringPlaybackTargets();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlaybackTargetPickerMac::outputeDeviceAvailabilityChangedTimerFired()
</del><ins>+void MediaPlaybackTargetPickerMac::pendingActionTimerFired()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_outputDeviceMenuController || !m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client->externalOutputDeviceAvailableDidChange(devicePicker().externalOutputDeviceAvailable);
</del><ins>+ PendingActionFlags pendingActions = m_pendingActionFlags;
+ m_pendingActionFlags = 0;
+
+ if (pendingActions & OutputDeviceAvailabilityChanged)
+ m_client->externalOutputDeviceAvailableDidChange(devicePicker().externalOutputDeviceAvailable);
+
+ if (pendingActions & CurrentDeviceDidChange) {
+ AVOutputDeviceMenuControllerType* devicePicker = this->devicePicker();
+ if (devicePicker)
+ m_client->setPlaybackTarget(WebCore::MediaPlaybackTargetMac::create([devicePicker outputContext]));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::availableDevicesDidChange()
</span><span class="lines">@@ -93,8 +108,7 @@
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_deviceChangeTimer.stop();
- m_deviceChangeTimer.startOneShot(0);
</del><ins>+ addPendingAction(OutputDeviceAvailabilityChanged);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AVOutputDeviceMenuControllerType *MediaPlaybackTargetPickerMac::devicePicker()
</span><span class="lines">@@ -116,24 +130,31 @@
</span><span class="cx"> return m_outputDeviceMenuController.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlaybackTargetPickerMac::showPlaybackTargetPicker(const FloatRect& location, bool)
</del><ins>+void MediaPlaybackTargetPickerMac::showPlaybackTargetPicker(const FloatRect& location, bool checkActiveRoute)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- [devicePicker() showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight];
</del><ins>+ AVOutputDeviceMenuControllerType *picker = devicePicker();
+ if ([picker respondsToSelector:@selector(showMenuForRect:appearanceName:allowReselectionOfSelectedOutputDevice:)]) {
+ if ([picker showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight allowReselectionOfSelectedOutputDevice:!checkActiveRoute])
+ currentDeviceDidChange();
+ } else
+ [picker showMenuForRect:location appearanceName:NSAppearanceNameVibrantLight];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaPlaybackTargetPickerMac::addPendingAction(PendingActionFlags action)
+{
+ m_pendingActionFlags |= action;
+ m_pendingActionTimer.startOneShot(0);
+}
+
</ins><span class="cx"> void MediaPlaybackTargetPickerMac::currentDeviceDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- AVOutputDeviceMenuControllerType* devicePicker = this->devicePicker();
- if (!devicePicker)
- return;
-
- m_client->setPlaybackTarget(WebCore::MediaPlaybackTargetMac::create([devicePicker outputContext]));
</del><ins>+ addPendingAction(CurrentDeviceDidChange);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlaybackTargetPickerMac::startingMonitoringPlaybackTargets()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (183559 => 183560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-04-29 17:44:53 UTC (rev 183559)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-04-29 18:05:25 UTC (rev 183560)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> @property (readonly, getter=isExternalOutputDevicePicked) BOOL externalOutputDevicePicked;
</span><span class="cx">
</span><span class="cx"> - (void)showMenuForRect:(NSRect)screenRect appearanceName:(NSString *)appearanceName;
</span><ins>+- (BOOL)showMenuForRect:(NSRect)screenRect appearanceName:(NSString *)appearanceName allowReselectionOfSelectedOutputDevice:(BOOL)allowReselectionOfSelectedOutputDevice;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>