Diff
Modified: trunk/Source/WebCore/ChangeLog (184813 => 184814)
--- trunk/Source/WebCore/ChangeLog 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/ChangeLog 2015-05-23 02:11:57 UTC (rev 184814)
@@ -1,3 +1,35 @@
+2015-05-22 Eric Carlson <eric.carl...@apple.com>
+
+ MediaPlayer doesn't need isPlayingToWirelessPlaybackTarget and isCurrentPlaybackTargetWireless
+ https://bugs.webkit.org/show_bug.cgi?id=145325
+
+ Reviewed by Brent Fulgham.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::webkitCurrentPlaybackTargetIsWireless): Call isCurrentPlaybackTargetWireless
+ directly.
+ (WebCore::HTMLMediaElement::wirelessRoutesAvailableDidChange): Ditto.
+ (WebCore::HTMLMediaElement::isPlayingToWirelessPlaybackTarget): Ditto.
+ (WebCore::HTMLMediaElement::mediaState): Ditto.
+
+ * html/HTMLMediaSession.cpp:
+ (WebCore::HTMLMediaSession::currentPlaybackTargetIsWireless): Deleted.
+ * html/HTMLMediaSession.h:
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::isPlayingToWirelessPlaybackTarget): Deleted.
+ * platform/graphics/MediaPlayer.h:
+
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::isPlayingToWirelessPlaybackTarget): Deleted.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::isPlayingToWirelessPlaybackTarget): Deleted.
+
+ * platform/ios/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::updateForEventName): Call webkitCurrentPlaybackTargetIsWireless.
+
2015-05-22 Jon Lee <jon...@apple.com>
Rename MediaPlaybackAllowsInline
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (184813 => 184814)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-05-23 02:11:57 UTC (rev 184814)
@@ -4918,7 +4918,7 @@
bool HTMLMediaElement::webkitCurrentPlaybackTargetIsWireless() const
{
- return m_mediaSession->currentPlaybackTargetIsWireless(*this);
+ return m_player && m_player->isCurrentPlaybackTargetWireless();
}
void HTMLMediaElement::wirelessRoutesAvailableDidChange()
@@ -5010,7 +5010,7 @@
bool HTMLMediaElement::isPlayingToWirelessPlaybackTarget() const
{
- bool isPlaying = m_player && m_player->isPlayingToWirelessPlaybackTarget();
+ bool isPlaying = m_player && m_player->isCurrentPlaybackTargetWireless();
LOG(Media, "HTMLMediaElement::isPlayingToWirelessPlaybackTarget(%p) - returning %s", this, boolString(isPlaying));
@@ -6289,7 +6289,7 @@
bool hasActiveVideo = isVideo() && hasVideo();
bool hasAudio = this->hasAudio();
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- if (isPlayingToWirelessPlaybackTarget())
+ if (m_player && m_player->isCurrentPlaybackTargetWireless())
state |= IsPlayingToExternalDevice;
if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this) && m_hasPlaybackTargetAvailabilityListeners && m_player->canPlayToWirelessPlaybackTarget())
Modified: trunk/Source/WebCore/html/HTMLMediaSession.cpp (184813 => 184814)
--- trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/html/HTMLMediaSession.cpp 2015-05-23 02:11:57 UTC (rev 184814)
@@ -175,20 +175,6 @@
}
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
-bool HTMLMediaSession::currentPlaybackTargetIsWireless(const HTMLMediaElement& element) const
-{
- MediaPlayer* player = element.player();
- if (!player) {
- LOG(Media, "HTMLMediaSession::currentPlaybackTargetIsWireless - returning FALSE because player is NULL");
- return false;
- }
-
- bool isWireless = player->isCurrentPlaybackTargetWireless();
- LOG(Media, "HTMLMediaSession::currentPlaybackTargetIsWireless - returning %s", isWireless ? "TRUE" : "FALSE");
-
- return isWireless;
-}
-
void HTMLMediaSession::showPlaybackTargetPicker(const HTMLMediaElement& element)
{
LOG(Media, "HTMLMediaSession::showPlaybackTargetPicker");
Modified: trunk/Source/WebCore/html/HTMLMediaSession.h (184813 => 184814)
--- trunk/Source/WebCore/html/HTMLMediaSession.h 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/html/HTMLMediaSession.h 2015-05-23 02:11:57 UTC (rev 184814)
@@ -55,7 +55,6 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
void showPlaybackTargetPicker(const HTMLMediaElement&);
- bool currentPlaybackTargetIsWireless(const HTMLMediaElement&) const;
bool hasWirelessPlaybackTargets(const HTMLMediaElement&) const;
bool wirelessVideoPlaybackDisabled(const HTMLMediaElement&) const;
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (184813 => 184814)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-05-23 02:11:57 UTC (rev 184814)
@@ -883,11 +883,6 @@
return m_private->canPlayToWirelessPlaybackTarget();
}
-bool MediaPlayer::isPlayingToWirelessPlaybackTarget() const
-{
- return m_private->isPlayingToWirelessPlaybackTarget();
-}
-
void MediaPlayer::setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&& device)
{
m_private->setWirelessPlaybackTarget(WTF::move(device));
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (184813 => 184814)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2015-05-23 02:11:57 UTC (rev 184814)
@@ -468,8 +468,6 @@
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- bool isCurrentPlaybackTargetWireless() const;
-
enum WirelessPlaybackTargetType { TargetTypeNone, TargetTypeAirPlay, TargetTypeTVOut };
WirelessPlaybackTargetType wirelessPlaybackTargetType() const;
@@ -481,8 +479,8 @@
void currentPlaybackTargetIsWirelessChanged();
void playbackTargetAvailabilityChanged();
+ bool isCurrentPlaybackTargetWireless() const;
bool canPlayToWirelessPlaybackTarget() const;
- bool isPlayingToWirelessPlaybackTarget() const;
void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&);
void setShouldPlayToPlaybackTarget(bool);
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (184813 => 184814)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2015-05-23 02:11:57 UTC (rev 184814)
@@ -161,7 +161,6 @@
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- virtual bool isCurrentPlaybackTargetWireless() const { return false; }
virtual String wirelessPlaybackTargetName() const { return emptyString(); }
virtual MediaPlayer::WirelessPlaybackTargetType wirelessPlaybackTargetType() const { return MediaPlayer::TargetTypeNone; }
@@ -170,7 +169,7 @@
virtual void setWirelessVideoPlaybackDisabled(bool) { }
virtual bool canPlayToWirelessPlaybackTarget() const { return false; }
- virtual bool isPlayingToWirelessPlaybackTarget() { return false; }
+ virtual bool isCurrentPlaybackTargetWireless() const { return false; }
virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) { }
virtual void setShouldPlayToPlaybackTarget(bool) { }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (184813 => 184814)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2015-05-23 02:11:57 UTC (rev 184814)
@@ -287,7 +287,6 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
virtual void setShouldPlayToPlaybackTarget(bool) override;
- virtual bool isPlayingToWirelessPlaybackTarget();
#endif
virtual double maxFastForwardRate() const override { return m_cachedCanPlayFastForward ? std::numeric_limits<double>::infinity() : 2.0; }
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184813 => 184814)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-23 02:11:57 UTC (rev 184814)
@@ -2823,15 +2823,6 @@
m_avPlayer.get().outputContext = newContext;
setDelayCallbacks(false);
}
-
-bool MediaPlayerPrivateAVFoundationObjC::isPlayingToWirelessPlaybackTarget()
-{
- if (!m_avPlayer)
- return false;
-
- RetainPtr<AVOutputContext> currentContext = m_avPlayer.get().outputContext;
- return currentContext && currentContext.get().deviceName;
-}
#endif // !PLATFORM(IOS)
void MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback()
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm (184813 => 184814)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-05-23 01:57:43 UTC (rev 184813)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-05-23 02:11:57 UTC (rev 184814)
@@ -151,7 +151,7 @@
if (all
|| eventName == eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent) {
- bool enabled = m_videoElement->mediaSession().currentPlaybackTargetIsWireless(*m_videoElement);
+ bool enabled = m_videoElement->webkitCurrentPlaybackTargetIsWireless();
WebVideoFullscreenInterface::ExternalPlaybackTargetType targetType = WebVideoFullscreenInterface::TargetTypeNone;
String localizedDeviceName;
