Title: [187657] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187657
- Author
- [email protected]
- Date
- 2015-07-31 10:56:46 -0700 (Fri, 31 Jul 2015)
Log Message
Merged r187516. rdar://problem/20847009
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187656 => 187657)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 17:49:38 UTC (rev 187656)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-31 17:56:46 UTC (rev 187657)
@@ -1,5 +1,24 @@
2015-07-31 Lucas Forschler <[email protected]>
+ Merge r187516
+
+ 2015-07-28 Eric Carlson <[email protected]>
+
+ [iOS] Set AirPlay discovery mode to disabled when page is hidden
+ https://bugs.webkit.org/show_bug.cgi?id=147369
+
+ Reviewed by Jer Noble.
+
+ * html/MediaElementSession.cpp:
+ (WebCore::MediaElementSession::requiresPlaybackTargetRouteMonitoring): Return false when
+ the client is not visible.
+ * html/MediaElementSession.h:
+
+ * platform/audio/PlatformMediaSession.cpp:
+ (WebCore::PlatformMediaSession::clientDataBufferingTimerFired): Call configureWireLessTargetMonitoring.
+
+2015-07-31 Lucas Forschler <[email protected]>
+
Merge r187491
2015-07-28 Jer Noble <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp (187656 => 187657)
--- branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp 2015-07-31 17:49:38 UTC (rev 187656)
+++ branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.cpp 2015-07-31 17:56:46 UTC (rev 187657)
@@ -413,6 +413,13 @@
return settings && settings->allowsPictureInPictureMediaPlayback() && !element.webkitCurrentPlaybackTargetIsWireless();
}
+#if PLATFORM(IOS)
+bool MediaElementSession::requiresPlaybackTargetRouteMonitoring() const
+{
+ return m_hasPlaybackTargetAvailabilityListeners && !client().elementIsHidden();
+}
+#endif
+
#if ENABLE(MEDIA_SOURCE)
const unsigned fiveMinutesOf1080PVideo = 290 * 1024 * 1024; // 290 MB is approximately 5 minutes of 8Mbps (1080p) content.
const unsigned fiveMinutesStereoAudio = 14 * 1024 * 1024; // 14 MB is approximately 5 minutes of 384kbps content.
Modified: branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.h (187656 => 187657)
--- branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.h 2015-07-31 17:49:38 UTC (rev 187656)
+++ branches/safari-601.1-branch/Source/WebCore/html/MediaElementSession.h 2015-07-31 17:56:46 UTC (rev 187657)
@@ -112,7 +112,7 @@
virtual void setShouldPlayToPlaybackTarget(bool) override;
#endif
#if PLATFORM(IOS)
- bool requiresPlaybackTargetRouteMonitoring() const override { return m_hasPlaybackTargetAvailabilityListeners; }
+ bool requiresPlaybackTargetRouteMonitoring() const override;
#endif
BehaviorRestrictions m_restrictions;
Modified: branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp (187656 => 187657)
--- branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2015-07-31 17:49:38 UTC (rev 187656)
+++ branches/safari-601.1-branch/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2015-07-31 17:56:46 UTC (rev 187657)
@@ -201,6 +201,10 @@
updateClientDataBuffering();
+#if PLATFORM(IOS)
+ PlatformMediaSessionManager::sharedManager().configureWireLessTargetMonitoring();
+#endif
+
if (m_state != Playing || !m_client.elementIsHidden())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
