Title: [93141] branches/safari-534.51-branch/Source/WebCore
- Revision
- 93141
- Author
- lforsch...@apple.com
- Date
- 2011-08-16 12:34:30 -0700 (Tue, 16 Aug 2011)
Log Message
Merge r93047.
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (93140 => 93141)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-16 19:18:11 UTC (rev 93140)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-16 19:34:30 UTC (rev 93141)
@@ -1,5 +1,25 @@
2011-08-16 Lucas Forschler <lforsch...@apple.com>
+ Merged 93047
+
+ 2011-08-12 Jeff Miller <je...@apple.com>
+
+ MediaPlayerPrivateAVFoundationCF::playerItemStatus() should return MediaPlayerAVPlayerItemStatusDoesNotExist if there is no AVPlayerItem
+ https://bugs.webkit.org/show_bug.cgi?id=66171
+
+ MediaPlayerPrivateAVFoundationCF::playerItemStatus() should return MediaPlayerAVPlayerItemStatusDoesNotExist if there is no AVPlayerItem
+ to match the Mac implementation in MediaPlayerPrivateAVFoundationObjC. I also added better logging to notificationCallback().
+
+ Reviewed by Jon Honeycutt.
+
+ No new tests, uses existing media tests.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::playerItemStatus): Return MediaPlayerAVPlayerItemStatusDoesNotExist if no AVPlayerItem.
+ (WebCore::AVFWrapper::notificationCallback): Log the name of the received notification.
+
+2011-08-16 Lucas Forschler <lforsch...@apple.com>
+
Merged 92977
2011-08-12 Jeff Miller <je...@apple.com>
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp (93140 => 93141)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp 2011-08-16 19:18:11 UTC (rev 93140)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundationCF.cpp 2011-08-16 19:34:30 UTC (rev 93141)
@@ -388,7 +388,7 @@
MediaPlayerPrivateAVFoundation::ItemStatus MediaPlayerPrivateAVFoundationCF::playerItemStatus() const
{
if (!avPlayerItem(m_avfWrapper))
- return MediaPlayerPrivateAVFoundation::MediaPlayerAVPlayerItemStatusUnknown;
+ return MediaPlayerPrivateAVFoundation::MediaPlayerAVPlayerItemStatusDoesNotExist;
AVCFPlayerItemStatus status = AVCFPlayerItemGetStatus(avPlayerItem(m_avfWrapper), 0);
if (status == AVCFPlayerItemStatusUnknown)
@@ -1041,7 +1041,11 @@
return;
}
- LOG(Media, "AVFWrapper::notificationCallback(%p)", self);
+#if !LOG_DISABLED
+ char notificationName[256];
+ CFStringGetCString(propertyName, notificationName, sizeof(notificationName), kCFStringEncodingASCII);
+ LOG(Media, "AVFWrapper::notificationCallback(%p) %s", self, notificationName);
+#endif
if (CFEqual(propertyName, AVCFPlayerItemDidPlayToEndTimeNotification))
self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::ItemDidPlayToEndTime);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
