Title: [158888] tags/Safari-538.5/Source/WebCore
- Revision
- 158888
- Author
- [email protected]
- Date
- 2013-11-07 17:29:03 -0800 (Thu, 07 Nov 2013)
Log Message
Merge r158869 for <rdar://problem/15406440>.
Modified Paths
Diff
Modified: tags/Safari-538.5/Source/WebCore/ChangeLog (158887 => 158888)
--- tags/Safari-538.5/Source/WebCore/ChangeLog 2013-11-08 01:12:52 UTC (rev 158887)
+++ tags/Safari-538.5/Source/WebCore/ChangeLog 2013-11-08 01:29:03 UTC (rev 158888)
@@ -1,3 +1,19 @@
+2013-11-07 Lucas Forschler <[email protected]>
+
+ Merge r158869
+
+ 2013-11-07 Jer Noble <[email protected]>
+
+ [Mac] Crash at com.apple.WebCore: -[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:] + 2084
+ https://bugs.webkit.org/show_bug.cgi?id=124012
+
+ Reviewed by Eric Carlson.
+
+ The value of the 'duration' key is a NSConcreteValue wrapping a CMTime, not a NSNumber.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+
2013-10-25 Jer Noble <[email protected]>
[MSE] Add MediaSource extensions to AudioTrack, VideoTrack, and TextTrack.
Modified: tags/Safari-538.5/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (158887 => 158888)
--- tags/Safari-538.5/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-11-08 01:12:52 UTC (rev 158887)
+++ tags/Safari-538.5/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-11-08 01:29:03 UTC (rev 158888)
@@ -1888,7 +1888,7 @@
else if ([keyPath isEqualToString:@"presentationSize"])
function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::presentationSizeDidChange, m_callback, FloatSize([newValue sizeValue]));
else if ([keyPath isEqualToString:@"duration"])
- function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, [newValue doubleValue]);
+ function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::durationDidChange, m_callback, CMTimeGetSeconds([newValue CMTimeValue]));
}
if (context == MediaPlayerAVFoundationObservationContextPlayer && !willChange) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
