Title: [185362] trunk/Source/WebKit2
- Revision
- 185362
- Author
- [email protected]
- Date
- 2015-06-09 06:26:50 -0700 (Tue, 09 Jun 2015)
Log Message
REGRESSION (r185357): Fix build for iOS 8.x
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(fallbackIconForFile): Add cast prior to iOS 9.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185361 => 185362)
--- trunk/Source/WebKit2/ChangeLog 2015-06-09 10:30:45 UTC (rev 185361)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 13:26:50 UTC (rev 185362)
@@ -1,3 +1,10 @@
+2015-06-09 David Kilzer <[email protected]>
+
+ REGRESSION (r185357): Fix build for iOS 8.x
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (fallbackIconForFile): Add cast prior to iOS 9.
+
2015-06-09 Gyuyoung Kim <[email protected]>
[EFL] Fix a crash on MiniBrowser when running on debug mode
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (185361 => 185362)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-06-09 10:30:45 UTC (rev 185361)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-06-09 13:26:50 UTC (rev 185362)
@@ -139,7 +139,11 @@
ASSERT_ARG(file, [file isFileURL]);
UIDocumentInteractionController *interactionController = [UIDocumentInteractionController interactionControllerWithURL:file];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
+ return thumbnailSizedImageForImage(((UIImage *)interactionController.icons[0]).CGImage);
+#else
return thumbnailSizedImageForImage(interactionController.icons[0].CGImage);
+#endif
}
static UIImage* iconForImageFile(NSURL *file)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
