Title: [177480] branches/safari-600.1.4.13-branch/Source/WebCore
- Revision
- 177480
- Author
- [email protected]
- Date
- 2014-12-17 17:25:49 -0800 (Wed, 17 Dec 2014)
Log Message
Merged build fix for r177375. rdar://problem/19271256
Modified Paths
Diff
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177479 => 177480)
--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-18 01:05:33 UTC (rev 177479)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-18 01:25:49 UTC (rev 177480)
@@ -1,5 +1,17 @@
2014-12-17 Babak Shafiei <[email protected]>
+ Merge build fix for r177375.
+
+ 2014-12-16 Jer Noble <[email protected]>
+
+ Unreviewed build fix after r177375; explicitly cast to NSUInteger.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setAudioMediaSelectionOptions):
+ (WebVideoFullscreenInterfaceAVKit::setLegibleMediaSelectionOptions):
+
+2014-12-17 Babak Shafiei <[email protected]>
+
Merge patch for r177375.
2014-12-16 Jer Noble <[email protected]>
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (177479 => 177480)
--- branches/safari-600.1.4.13-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-18 01:05:33 UTC (rev 177479)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-12-18 01:25:49 UTC (rev 177480)
@@ -684,7 +684,7 @@
dispatch_async(dispatch_get_main_queue(), [webOptions, strongThis, selectedIndex] {
strongThis->playerController().audioMediaSelectionOptions = webOptions.get();
if (selectedIndex < [webOptions count])
- strongThis->playerController().currentAudioMediaSelectionOption = [webOptions objectAtIndex:selectedIndex];
+ strongThis->playerController().currentAudioMediaSelectionOption = [webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)];
});
}
@@ -696,7 +696,7 @@
dispatch_async(dispatch_get_main_queue(), [webOptions, strongThis, selectedIndex] {
strongThis->playerController().legibleMediaSelectionOptions = webOptions.get();
if (selectedIndex < [webOptions count])
- strongThis->playerController().currentLegibleMediaSelectionOption = [webOptions objectAtIndex:selectedIndex];
+ strongThis->playerController().currentLegibleMediaSelectionOption = [webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)];
});
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
