Title: [166783] trunk/Source/WebCore
- Revision
- 166783
- Author
- [email protected]
- Date
- 2014-04-04 09:14:43 -0700 (Fri, 04 Apr 2014)
Log Message
[Win] Unreviewed test fix (crash in debug build).
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::AVFWrapper::legibleOutputCallback): Correct assertion. This
callback is scheduled for the caption queue, not the main queue.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (166782 => 166783)
--- trunk/Source/WebCore/ChangeLog 2014-04-04 16:12:35 UTC (rev 166782)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 16:14:43 UTC (rev 166783)
@@ -1,3 +1,11 @@
+2014-04-04 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed test fix (crash in debug build).
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::legibleOutputCallback): Correct assertion. This
+ callback is scheduled for the caption queue, not the main queue.
+
2014-04-03 Brent Fulgham <[email protected]>
[Win] Load Media Controls js/css from bundle
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (166782 => 166783)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-04-04 16:12:35 UTC (rev 166782)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-04-04 16:14:43 UTC (rev 166783)
@@ -1629,7 +1629,7 @@
void AVFWrapper::legibleOutputCallback(void* context, AVCFPlayerItemLegibleOutputRef legibleOutput, CFArrayRef attributedStrings, CFArrayRef /*nativeSampleBuffers*/, CMTime itemTime)
{
- ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
+ ASSERT(dispatch_get_main_queue() != dispatch_get_current_queue());
MutexLocker locker(mapLock());
AVFWrapper* self = avfWrapperForCallbackContext(context);
if (!self) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
