Title: [199411] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199411
- Author
- [email protected]
- Date
- 2016-04-12 23:45:00 -0700 (Tue, 12 Apr 2016)
Log Message
Merge r198361 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199410 => 199411)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:44:02 UTC (rev 199410)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:45:00 UTC (rev 199411)
@@ -1,3 +1,13 @@
+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-17 Brady Eidson <[email protected]>
Don't try to restore deleted MemoryIndexes if their owning object store is not restored.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/html/track/TextTrack.cpp (199410 => 199411)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/html/track/TextTrack.cpp 2016-04-13 06:44:02 UTC (rev 199410)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/html/track/TextTrack.cpp 2016-04-13 06:45:00 UTC (rev 199411)
@@ -136,12 +136,12 @@
m_client->textTrackRemoveCues(this, m_cues.get());
for (size_t i = 0; i < m_cues->length(); ++i)
- m_cues->item(i)->setTrack(0);
- if (m_regions) {
- for (size_t i = 0; i < m_regions->length(); ++i)
- m_regions->item(i)->setTrack(0);
- }
+ m_cues->item(i)->setTrack(nullptr);
}
+ if (m_regions) {
+ for (size_t i = 0; i < m_regions->length(); ++i)
+ m_regions->item(i)->setTrack(nullptr);
+ }
clearClient();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
