Title: [188224] branches/safari-601.1-branch/Source/WebCore
- Revision
- 188224
- Author
- dburk...@apple.com
- Date
- 2015-08-10 13:36:48 -0700 (Mon, 10 Aug 2015)
Log Message
Merge r188196. rdar://problem/22192773
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188223 => 188224)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:36:10 UTC (rev 188223)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:36:48 UTC (rev 188224)
@@ -1,5 +1,23 @@
2015-08-10 Dana Burkart <dburk...@apple.com>
+ Merge r188196. rdar://problem/22192773
+
+ 2015-08-09 Eric Carlson <eric.carl...@apple.com>
+
+ [Mac] Always require ExternalDeviceAutoPlayCandidate flag to AirPlay automatically
+ https://bugs.webkit.org/show_bug.cgi?id=147801
+
+ Reviewed by Dean Jackson.
+
+ Test: http/tests/media/video-media-document-disposition-download.html
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Don't tell the last element
+ to begin playing to the target unless the ExternalDeviceAutoPlayCandidate flag is set and
+ it is not currently playing.
+
+2015-08-10 Dana Burkart <dburk...@apple.com>
+
Merge r188190. rdar://problem/22191482
2015-08-08 Commit Queue <commit-qu...@webkit.org>
Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (188223 => 188224)
--- branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-08-10 20:36:10 UTC (rev 188223)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2015-08-10 20:36:48 UTC (rev 188224)
@@ -272,7 +272,7 @@
indexOfClientWillPlayToTarget = indexOfClientThatRequestedPicker;
if (indexOfClientWillPlayToTarget == notFound && indexOfLastClientToRequestPicker != notFound)
indexOfClientWillPlayToTarget = indexOfLastClientToRequestPicker;
- if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute)
+ if (indexOfClientWillPlayToTarget == notFound && haveActiveRoute && flagsAreSet(m_clientState[0]->flags, MediaProducer::ExternalDeviceAutoPlayCandidate) && !flagsAreSet(m_clientState[0]->flags, MediaProducer::IsPlayingVideo))
indexOfClientWillPlayToTarget = 0;
LOG(Media, "WebMediaSessionManager::configurePlaybackTargetClients - indexOfClientWillPlayToTarget = %zu", indexOfClientWillPlayToTarget);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
