<!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>[183509] 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/183509">183509</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-28 14:40:10 -0700 (Tue, 28 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Simplify code to support media engines which do not support target playback
https://bugs.webkit.org/show_bug.cgi?id=144332
Reviewed by Jer Noble.
* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::externalOutputDeviceAvailableDidChange): Always make client
callback, let them decide if it is significant or not.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement): m_loadTimer -> m_pendingActionTimer.
(WebCore::HTMLMediaElement::scheduleDelayedAction): Handle CheckPlaybackTargetCompatablity.
(WebCore::HTMLMediaElement::scheduleNextSourceChild): m_loadTimer -> m_pendingActionTimer.
(WebCore::HTMLMediaElement::loadTimerFired): Renamed pendingActionTimerFired.
(WebCore::HTMLMediaElement::prepareForLoad): m_loadTimer -> m_pendingActionTimer.
(WebCore::HTMLMediaElement::setDefaultPlaybackRate): Add logging.
(WebCore::HTMLMediaElement::clearMediaPlayer): m_loadTimer -> m_pendingActionTimer.
(WebCore::HTMLMediaElement::webkitCurrentPlaybackTargetIsSupported): Removed.
(WebCore::HTMLMediaElement::dispatchEvent): If a 'webkitcurrentplaybacktargetiswirelesschanged'
event is dispatched when the current target is wireless but the media engine does not support
wireless playback, tell the media engine not to play to the target.
* html/HTMLMediaElement.h:
* html/HTMLMediaElement.idl:
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::showPlaybackTargetPicker): Drive-by fix to disallow audio-only files.
(WebCore::HTMLMediaSession::currentPlaybackTargetIsSupported): Deleted.
* html/HTMLMediaSession.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::isCurrentPlaybackTargetSupported): Deleted.
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Use a RetainPtr
to explicitly manage the lifetime of the temporary object.
(WebCore::MediaPlayerPrivateAVFoundationObjC::isPlayingToWirelessPlaybackTarget): Ditto.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setShouldPlayToPlaybackTarget):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetSupported): Deleted.
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::setShouldPlayToPlaybackTarget):
(WebCore::MediaPlayerPrivateQTKit::isCurrentPlaybackTargetWireless):
(WebCore::MediaPlayerPrivateQTKit::isCurrentPlaybackTargetSupported): Deleted.</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="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementidl">trunk/Source/WebCore/html/HTMLMediaElement.idl</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessioncpp">trunk/Source/WebCore/html/HTMLMediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaSessionh">trunk/Source/WebCore/html/HTMLMediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh">trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/ChangeLog 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-04-28 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] Simplify code to support media engines which do not support target playback
+ https://bugs.webkit.org/show_bug.cgi?id=144332
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::externalOutputDeviceAvailableDidChange): Always make client
+ callback, let them decide if it is significant or not.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement): m_loadTimer -> m_pendingActionTimer.
+ (WebCore::HTMLMediaElement::scheduleDelayedAction): Handle CheckPlaybackTargetCompatablity.
+ (WebCore::HTMLMediaElement::scheduleNextSourceChild): m_loadTimer -> m_pendingActionTimer.
+ (WebCore::HTMLMediaElement::loadTimerFired): Renamed pendingActionTimerFired.
+ (WebCore::HTMLMediaElement::prepareForLoad): m_loadTimer -> m_pendingActionTimer.
+ (WebCore::HTMLMediaElement::setDefaultPlaybackRate): Add logging.
+ (WebCore::HTMLMediaElement::clearMediaPlayer): m_loadTimer -> m_pendingActionTimer.
+ (WebCore::HTMLMediaElement::webkitCurrentPlaybackTargetIsSupported): Removed.
+ (WebCore::HTMLMediaElement::dispatchEvent): If a 'webkitcurrentplaybacktargetiswirelesschanged'
+ event is dispatched when the current target is wireless but the media engine does not support
+ wireless playback, tell the media engine not to play to the target.
+ * html/HTMLMediaElement.h:
+ * html/HTMLMediaElement.idl:
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::showPlaybackTargetPicker): Drive-by fix to disallow audio-only files.
+ (WebCore::HTMLMediaSession::currentPlaybackTargetIsSupported): Deleted.
+ * html/HTMLMediaSession.h:
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::isCurrentPlaybackTargetSupported): Deleted.
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Use a RetainPtr
+ to explicitly manage the lifetime of the temporary object.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::isPlayingToWirelessPlaybackTarget): Ditto.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::setShouldPlayToPlaybackTarget):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetSupported): Deleted.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::setShouldPlayToPlaybackTarget):
+ (WebCore::MediaPlayerPrivateQTKit::isCurrentPlaybackTargetWireless):
+ (WebCore::MediaPlayerPrivateQTKit::isCurrentPlaybackTargetSupported): Deleted.
+
</ins><span class="cx"> 2015-04-28 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Use less memory for CombinedURLFilters.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionWebMediaSessionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -196,9 +196,6 @@
</span><span class="cx">
</span><span class="cx"> void WebMediaSessionManager::externalOutputDeviceAvailableDidChange(bool available)
</span><span class="cx"> {
</span><del>- if (m_externalOutputDeviceAvailable == available)
- return;
-
</del><span class="cx"> m_externalOutputDeviceAvailable = available;
</span><span class="cx"> for (auto& state : m_clientState)
</span><span class="cx"> state->client->externalOutputDeviceAvailableDidChange(state->contextId, available);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> HTMLMediaElement::HTMLMediaElement(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><span class="cx"> , ActiveDOMObject(&document)
</span><del>- , m_loadTimer(*this, &HTMLMediaElement::loadTimerFired)
</del><ins>+ , m_pendingActionTimer(*this, &HTMLMediaElement::pendingActionTimerFired)
</ins><span class="cx"> , m_progressEventTimer(*this, &HTMLMediaElement::progressEventTimerFired)
</span><span class="cx"> , m_playbackProgressTimer(*this, &HTMLMediaElement::playbackProgressTimerFired)
</span><span class="cx"> , m_scanTimer(*this, &HTMLMediaElement::scanTimerFired)
</span><span class="lines">@@ -694,14 +694,19 @@
</span><span class="cx"> setFlags(m_pendingActionFlags, TextTrackChangesNotification);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_loadTimer.startOneShot(0);
</del><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (actionType & CheckPlaybackTargetCompatablity)
+ setFlags(m_pendingActionFlags, CheckPlaybackTargetCompatablity);
+#endif
+
+ m_pendingActionTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::scheduleNextSourceChild()
</span><span class="cx"> {
</span><span class="cx"> // Schedule the timer to try the next <source> element WITHOUT resetting state ala prepareForLoad.
</span><span class="cx"> setFlags(m_pendingActionFlags, LoadMediaResource);
</span><del>- m_loadTimer.startOneShot(0);
</del><ins>+ m_pendingActionTimer.startOneShot(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::scheduleEvent(const AtomicString& eventName)
</span><span class="lines">@@ -717,7 +722,7 @@
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(event.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::loadTimerFired()
</del><ins>+void HTMLMediaElement::pendingActionTimerFired()
</ins><span class="cx"> {
</span><span class="cx"> Ref<HTMLMediaElement> protect(*this); // loadNextSourceChild may fire 'beforeload', which can make arbitrary DOM mutations.
</span><span class="cx">
</span><span class="lines">@@ -738,6 +743,13 @@
</span><span class="cx"> notifyMediaPlayerOfTextTrackChanges();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ if (m_pendingActionFlags & CheckPlaybackTargetCompatablity && m_player && m_player->isCurrentPlaybackTargetWireless() && !m_player->canPlayToWirelessPlaybackTarget()) {
+ LOG(Media, "HTMLMediaElement::pendingActionTimerFired(%p) - calling setShouldPlayToPlaybackTarget(false)", this);
+ m_player->setShouldPlayToPlaybackTarget(false);
+ }
+#endif
+
</ins><span class="cx"> m_pendingActionFlags = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -826,7 +838,7 @@
</span><span class="cx">
</span><span class="cx"> // Perform the cleanup required for the resource load algorithm to run.
</span><span class="cx"> stopPeriodicTimers();
</span><del>- m_loadTimer.stop();
</del><ins>+ m_pendingActionTimer.stop();
</ins><span class="cx"> // FIXME: Figure out appropriate place to reset LoadTextTrackResource if necessary and set m_pendingActionFlags to 0 here.
</span><span class="cx"> m_pendingActionFlags &= ~LoadMediaResource;
</span><span class="cx"> m_sentEndEvent = false;
</span><span class="lines">@@ -2644,6 +2656,7 @@
</span><span class="cx"> void HTMLMediaElement::setDefaultPlaybackRate(double rate)
</span><span class="cx"> {
</span><span class="cx"> if (m_defaultPlaybackRate != rate) {
</span><ins>+ LOG(Media, "HTMLMediaElement::setDefaultPlaybackRate(%p) - %f", this, rate);
</ins><span class="cx"> m_defaultPlaybackRate = rate;
</span><span class="cx"> scheduleEvent(eventNames().ratechangeEvent);
</span><span class="cx"> }
</span><span class="lines">@@ -4709,7 +4722,7 @@
</span><span class="cx"> m_player = nullptr;
</span><span class="cx">
</span><span class="cx"> stopPeriodicTimers();
</span><del>- m_loadTimer.stop();
</del><ins>+ m_pendingActionTimer.stop();
</ins><span class="cx">
</span><span class="cx"> clearFlags(m_pendingActionFlags, flags);
</span><span class="cx"> m_loadState = WaitingForSource;
</span><span class="lines">@@ -4858,11 +4871,6 @@
</span><span class="cx"> return m_mediaSession->currentPlaybackTargetIsWireless(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaElement::webkitCurrentPlaybackTargetIsSupported() const
-{
- return m_mediaSession->currentPlaybackTargetIsSupported(*this);
-}
-
</del><span class="cx"> void HTMLMediaElement::wirelessRoutesAvailableDidChange()
</span><span class="cx"> {
</span><span class="cx"> enqueuePlaybackTargetAvailabilityChangedEvent();
</span><span class="lines">@@ -4873,11 +4881,17 @@
</span><span class="cx"> LOG(Media, "HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged(%p) - webkitCurrentPlaybackTargetIsWireless = %s", this, boolString(webkitCurrentPlaybackTargetIsWireless()));
</span><span class="cx"> scheduleEvent(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent);
</span><span class="cx">
</span><del>-#if ENABLE(WIRELESS_PLAYBACK_TARGET)
</del><span class="cx"> m_mediaSession->mediaStateDidChange(*this, mediaState());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+bool HTMLMediaElement::dispatchEvent(PassRefPtr<Event> prpEvent)
+{
+ RefPtr<Event> event = prpEvent;
+ if (event->type() == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent)
+ scheduleDelayedAction(CheckPlaybackTargetCompatablity);
+ return HTMLElement::dispatchEvent(event);
+}
+
</ins><span class="cx"> bool HTMLMediaElement::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
</span><span class="cx"> {
</span><span class="cx"> if (eventType != eventNames().webkitplaybacktargetavailabilitychangedEvent)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -139,8 +139,9 @@
</span><span class="cx"> ConfigureTextTracks = 1 << 1,
</span><span class="cx"> TextTrackChangesNotification = 1 << 2,
</span><span class="cx"> ConfigureTextTrackDisplay = 1 << 3,
</span><ins>+ CheckPlaybackTargetCompatablity = 1 << 4,
</ins><span class="cx">
</span><del>- EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay,
</del><ins>+ EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay | CheckPlaybackTargetCompatablity,
</ins><span class="cx"> };
</span><span class="cx"> void scheduleDelayedAction(DelayedActionType);
</span><span class="cx">
</span><span class="lines">@@ -356,7 +357,6 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void webkitShowPlaybackTargetPicker();
</span><span class="cx"> bool webkitCurrentPlaybackTargetIsWireless() const;
</span><del>- bool webkitCurrentPlaybackTargetIsSupported() const;
</del><span class="cx">
</span><span class="cx"> virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture) override;
</span><span class="cx"> virtual bool removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture) override;
</span><span class="lines">@@ -562,6 +562,9 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) override;
</span><span class="cx"> void enqueuePlaybackTargetAvailabilityChangedEvent();
</span><ins>+
+ using EventTarget::dispatchEvent;
+ virtual bool dispatchEvent(PassRefPtr<Event>) override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual String mediaPlayerReferrer() const override;
</span><span class="lines">@@ -604,7 +607,7 @@
</span><span class="cx">
</span><span class="cx"> virtual double mediaPlayerRequestedPlaybackRate() const override final;
</span><span class="cx">
</span><del>- void loadTimerFired();
</del><ins>+ void pendingActionTimerFired();
</ins><span class="cx"> void progressEventTimerFired();
</span><span class="cx"> void playbackProgressTimerFired();
</span><span class="cx"> void scanTimerFired();
</span><span class="lines">@@ -733,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> void updateCaptionContainer();
</span><span class="cx">
</span><del>- Timer m_loadTimer;
</del><ins>+ Timer m_pendingActionTimer;
</ins><span class="cx"> Timer m_progressEventTimer;
</span><span class="cx"> Timer m_playbackProgressTimer;
</span><span class="cx"> Timer m_scanTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -116,5 +116,4 @@
</span><span class="cx">
</span><span class="cx"> [Conditional=WIRELESS_PLAYBACK_TARGET] void webkitShowPlaybackTargetPicker();
</span><span class="cx"> [Conditional=WIRELESS_PLAYBACK_TARGET] readonly attribute boolean webkitCurrentPlaybackTargetIsWireless;
</span><del>- [Conditional=WIRELESS_PLAYBACK_TARGET] readonly attribute boolean webkitCurrentPlaybackTargetIsSupported;
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -189,20 +189,6 @@
</span><span class="cx"> return isWireless;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLMediaSession::currentPlaybackTargetIsSupported(const HTMLMediaElement& element) const
-{
- MediaPlayer* player = element.player();
- if (!player) {
- LOG(Media, "HTMLMediaSession::currentPlaybackTargetIsSupported - returning FALSE because player is NULL");
- return false;
- }
-
- bool isSupported = player->isCurrentPlaybackTargetSupported();
- LOG(Media, "HTMLMediaSession::currentPlaybackTargetIsSupported - returning %s", isSupported ? "TRUE" : "FALSE");
-
- return isSupported;
-}
-
</del><span class="cx"> void HTMLMediaSession::showPlaybackTargetPicker(const HTMLMediaElement& element)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLMediaSession::showPlaybackTargetPicker");
</span><span class="lines">@@ -217,6 +203,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+ if (!element.hasVideo()) {
+ LOG(Media, "HTMLMediaSession::showPlaybackTargetPicker - returning early because element has no video");
+ return;
+ }
+#endif
+
</ins><span class="cx"> element.document().showPlaybackTargetPicker(*this, is<HTMLVideoElement>(element));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -388,7 +381,8 @@
</span><span class="cx"> LOG(Media, "HTMLMediaSession::mediaEngineUpdated");
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- setWirelessVideoPlaybackDisabled(element, m_restrictions & WirelessVideoPlaybackDisabled);
</del><ins>+ if (m_restrictions & WirelessVideoPlaybackDisabled)
+ setWirelessVideoPlaybackDisabled(element, true);
</ins><span class="cx"> if (m_playbackTarget)
</span><span class="cx"> client().setWirelessPlaybackTarget(*m_playbackTarget.copyRef());
</span><span class="cx"> if (m_shouldPlayToPlaybackTarget)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaSession.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaSession.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/html/HTMLMediaSession.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> void showPlaybackTargetPicker(const HTMLMediaElement&);
</span><span class="cx"> bool currentPlaybackTargetIsWireless(const HTMLMediaElement&) const;
</span><del>- bool currentPlaybackTargetIsSupported(const HTMLMediaElement&) const;
</del><span class="cx"> bool hasWirelessPlaybackTargets(const HTMLMediaElement&) const;
</span><span class="cx">
</span><span class="cx"> bool wirelessVideoPlaybackDisabled(const HTMLMediaElement&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -843,11 +843,6 @@
</span><span class="cx"> return m_private->isCurrentPlaybackTargetWireless();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MediaPlayer::isCurrentPlaybackTargetSupported() const
-{
- return m_private->isCurrentPlaybackTargetSupported();
-}
-
</del><span class="cx"> String MediaPlayer::wirelessPlaybackTargetName() const
</span><span class="cx"> {
</span><span class="cx"> return m_private->wirelessPlaybackTargetName();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -464,7 +464,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> bool isCurrentPlaybackTargetWireless() const;
</span><del>- bool isCurrentPlaybackTargetSupported() const;
</del><span class="cx">
</span><span class="cx"> enum WirelessPlaybackTargetType { TargetTypeNone, TargetTypeAirPlay, TargetTypeTVOut };
</span><span class="cx"> WirelessPlaybackTargetType wirelessPlaybackTargetType() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -161,7 +161,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> virtual bool isCurrentPlaybackTargetWireless() const { return false; }
</span><del>- virtual bool isCurrentPlaybackTargetSupported() const { return true; }
</del><span class="cx">
</span><span class="cx"> virtual String wirelessPlaybackTargetName() const { return emptyString(); }
</span><span class="cx"> virtual MediaPlayer::WirelessPlaybackTargetType wirelessPlaybackTargetType() const { return MediaPlayer::TargetTypeNone; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -2798,8 +2798,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> AVOutputContext *newContext = shouldPlay ? m_outputContext.get() : nil;
</span><del>- AVOutputContext *currentContext = m_avPlayer.get().outputContext;
- if ((!newContext && !currentContext) || [currentContext isEqual:newContext])
</del><ins>+ RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
+ if ((!newContext && !currentContext.get()) || [currentContext.get() isEqual:newContext])
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setDelayCallbacks(true);
</span><span class="lines">@@ -2814,10 +2814,8 @@
</span><span class="cx"> if (!m_avPlayer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!m_outputContext || !m_outputContext.get().deviceName)
- return false;
-
- return m_cachedRate;
</del><ins>+ RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
+ return currentContext && currentContext.get().deviceName;
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> virtual MediaTime totalFrameDelay() override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- virtual bool isCurrentPlaybackTargetSupported() const override;
</del><ins>+ virtual bool isCurrentPlaybackTargetWireless() const override;
</ins><span class="cx"> virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</span><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> bool m_hasAvailableVideoFrame;
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget;
</span><del>- bool m_currentPlaybackTargetIsSupported { true };
</del><ins>+ bool m_shouldPlayToTarget { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -807,14 +807,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-bool MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetSupported() const
-{
- if (!m_playbackTarget)
- return true;
-
- return !m_playbackTarget->hasActiveRoute();
-}
-
</del><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> m_playbackTarget = WTF::move(target);
</span><span class="lines">@@ -822,12 +814,22 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::setShouldPlayToPlaybackTarget(bool shouldPlayToTarget)
</span><span class="cx"> {
</span><del>- bool oldSupported = m_currentPlaybackTargetIsSupported;
- m_currentPlaybackTargetIsSupported = !shouldPlayToTarget;
</del><ins>+ if (shouldPlayToTarget == m_shouldPlayToTarget)
+ return;
</ins><span class="cx">
</span><del>- if (m_player && oldSupported != m_currentPlaybackTargetIsSupported)
</del><ins>+ m_shouldPlayToTarget = shouldPlayToTarget;
+
+ if (m_player)
</ins><span class="cx"> m_player->currentPlaybackTargetIsWirelessChanged();
</span><span class="cx"> }
</span><ins>+
+bool MediaPlayerPrivateMediaSourceAVFObjC::isCurrentPlaybackTargetWireless() const
+{
+ if (!m_playbackTarget)
+ return false;
+
+ return m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -180,10 +180,9 @@
</span><span class="cx"> virtual long platformErrorCode() const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>- virtual bool isCurrentPlaybackTargetSupported() const override;
</del><ins>+ virtual bool isCurrentPlaybackTargetWireless() const override;
</ins><span class="cx"> virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
</span><span class="cx"> virtual void setShouldPlayToPlaybackTarget(bool) override;
</span><del>- void togglePlayingToPlaybackTarget();
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="lines">@@ -215,7 +214,7 @@
</span><span class="cx"> mutable FloatSize m_cachedNaturalSize;
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> RefPtr<MediaPlaybackTarget> m_playbackTarget;
</span><del>- bool m_currentPlaybackTargetIsSupported { true };
</del><ins>+ bool m_shouldPlayToTarget { false };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (183508 => 183509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-04-28 21:19:15 UTC (rev 183508)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-04-28 21:40:10 UTC (rev 183509)
</span><span class="lines">@@ -1541,14 +1541,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><del>-bool MediaPlayerPrivateQTKit::isCurrentPlaybackTargetSupported() const
-{
- if (!m_playbackTarget)
- return true;
-
- return !m_playbackTarget->hasActiveRoute();
-}
-
</del><span class="cx"> void MediaPlayerPrivateQTKit::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& target)
</span><span class="cx"> {
</span><span class="cx"> m_playbackTarget = WTF::move(target);
</span><span class="lines">@@ -1556,12 +1548,22 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::setShouldPlayToPlaybackTarget(bool shouldPlayToTarget)
</span><span class="cx"> {
</span><del>- bool oldSupported = m_currentPlaybackTargetIsSupported;
- m_currentPlaybackTargetIsSupported = !shouldPlayToTarget;
</del><ins>+ if (shouldPlayToTarget == m_shouldPlayToTarget)
+ return;
</ins><span class="cx">
</span><del>- if (m_player && oldSupported != m_currentPlaybackTargetIsSupported)
</del><ins>+ m_shouldPlayToTarget = shouldPlayToTarget;
+
+ if (m_player)
</ins><span class="cx"> m_player->currentPlaybackTargetIsWirelessChanged();
</span><span class="cx"> }
</span><ins>+
+bool MediaPlayerPrivateQTKit::isCurrentPlaybackTargetWireless() const
+{
+ if (!m_playbackTarget)
+ return false;
+
+ return m_shouldPlayToTarget && m_playbackTarget->hasActiveRoute();
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>