Title: [182752] trunk/Source/WebCore
- Revision
- 182752
- Author
- [email protected]
- Date
- 2015-04-13 13:16:34 -0700 (Mon, 13 Apr 2015)
Log Message
[iOS] Treat a 'not found' media option index as the 'off' track.
https://bugs.webkit.org/show_bug.cgi?id=143672
Reviewed by Eric Carlson.
The UIProcess will pass in UINT64_MAX for the index of the legible option to select. Treat this
as if the captionOffMenuItem() had been selected to avoid a null dereference.
* platform/ios/WebVideoFullscreenModelVideoElement.mm:
(WebVideoFullscreenModelVideoElement::selectLegibleMediaOption):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182751 => 182752)
--- trunk/Source/WebCore/ChangeLog 2015-04-13 20:02:20 UTC (rev 182751)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 20:16:34 UTC (rev 182752)
@@ -1,3 +1,16 @@
+2015-04-13 Jer Noble <[email protected]>
+
+ [iOS] Treat a 'not found' media option index as the 'off' track.
+ https://bugs.webkit.org/show_bug.cgi?id=143672
+
+ Reviewed by Eric Carlson.
+
+ The UIProcess will pass in UINT64_MAX for the index of the legible option to select. Treat this
+ as if the captionOffMenuItem() had been selected to avoid a null dereference.
+
+ * platform/ios/WebVideoFullscreenModelVideoElement.mm:
+ (WebVideoFullscreenModelVideoElement::selectLegibleMediaOption):
+
2015-04-13 Said Abou-Hallawa <[email protected]>
list-style-image with SVG image renders at incorrect size.
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm (182751 => 182752)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-04-13 20:02:20 UTC (rev 182751)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm 2015-04-13 20:16:34 UTC (rev 182752)
@@ -343,6 +343,8 @@
if (index < m_legibleTracksForMenu.size())
textTrack = m_legibleTracksForMenu[static_cast<size_t>(index)].get();
+ else
+ textTrack = TextTrack::captionMenuOffItem();
m_videoElement->setSelectedTextTrack(textTrack);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
