Title: [198421] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 198421
- Author
- [email protected]
- Date
- 2016-03-18 09:05:38 -0700 (Fri, 18 Mar 2016)
Log Message
Merged r198361. rdar://problem/25234910
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198420 => 198421)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 16:04:24 UTC (rev 198420)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 16:05:38 UTC (rev 198421)
@@ -1,5 +1,19 @@
2016-03-18 Babak Shafiei <[email protected]>
+ Merge r198361.
+
+ 2016-03-17 Brent Fulgham <[email protected]>
+
+ Some media tests are flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=155614
+
+ Reviewed by Eric Carlson.
+
+ * html/track/TextTrack.cpp:
+ (WebCore::TextTrack::~TextTrack):
+
+2016-03-18 Babak Shafiei <[email protected]>
+
Merge r192770.
2015-11-25 Pranjal Jumde <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/html/track/TextTrack.cpp (198420 => 198421)
--- branches/safari-601.1.46-branch/Source/WebCore/html/track/TextTrack.cpp 2016-03-18 16:04:24 UTC (rev 198420)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/track/TextTrack.cpp 2016-03-18 16:05:38 UTC (rev 198421)
@@ -138,11 +138,11 @@
m_client->textTrackRemoveCues(this, m_cues.get());
for (size_t i = 0; i < m_cues->length(); ++i)
- m_cues->item(i)->setTrack(0);
+ m_cues->item(i)->setTrack(nullptr);
#if ENABLE(WEBVTT_REGIONS)
if (m_regions) {
for (size_t i = 0; i < m_regions->length(); ++i)
- m_regions->item(i)->setTrack(0);
+ m_regions->item(i)->setTrack(nullptr);
}
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
