Title: [184604] branches/safari-600.1.4.16-branch/Source/WebCore
- Revision
- 184604
- Author
- [email protected]
- Date
- 2015-05-19 17:57:23 -0700 (Tue, 19 May 2015)
Log Message
Merged r179010. rdar://problem/21008308
Modified Paths
Diff
Modified: branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog (184603 => 184604)
--- branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-05-20 00:55:35 UTC (rev 184603)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/ChangeLog 2015-05-20 00:57:23 UTC (rev 184604)
@@ -1,5 +1,21 @@
2015-05-19 Babak Shafiei <[email protected]>
+ Merge r179010.
+
+ 2015-01-23 Jer Noble <[email protected]>
+
+ Layout Test http/tests/media/track-in-band-hls-metadata.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=140827
+
+ Reviewed by Eric Carlson.
+
+ Create the m_metadataTrack by calling prepareMetadataTrack() before deref-ing it.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::metadataDidArrive):
+
+2015-05-19 Babak Shafiei <[email protected]>
+
Merge r183788.
2015-05-04 Zalan Bujtas <[email protected]>
Modified: branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (184603 => 184604)
--- branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-20 00:55:35 UTC (rev 184603)
+++ branches/safari-600.1.4.16-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-05-20 00:57:23 UTC (rev 184604)
@@ -2736,14 +2736,14 @@
if (seeking())
return;
+ if (!m_metadataTrack)
+ processMetadataTrack();
+
if (!metadata || [metadata isKindOfClass:[NSNull class]]) {
m_metadataTrack->updatePendingCueEndTimes(mediaTime);
return;
}
- if (!m_metadataTrack)
- processMetadataTrack();
-
// Set the duration of all incomplete cues before adding new ones.
double earliesStartTime = std::numeric_limits<double>::infinity();
for (AVMetadataItemType *item in m_currentMetaData.get()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
