Title: [257400] trunk/Source/WebKitLegacy/mac
- Revision
- 257400
- Author
- [email protected]
- Date
- 2020-02-25 17:39:08 -0800 (Tue, 25 Feb 2020)
Log Message
Build Fix
https://bugs.webkit.org/show_bug.cgi?id=208224
<rdar://problem/58879500>
Fix Build.
Reviewed by Tim Horton.
* WebView/WebFrameView.mm:
(+[WebFrameView _viewTypesAllowImageTypeOmission:]):
* WebView/WebView.mm:
(+[WebView _viewClass:andRepresentationClass:forMIMEType:allowingPlugins:]):
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (257399 => 257400)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-02-26 01:38:46 UTC (rev 257399)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-02-26 01:39:08 UTC (rev 257400)
@@ -1,3 +1,18 @@
+2020-02-25 Megan Gardner <[email protected]>
+
+ Build Fix
+ https://bugs.webkit.org/show_bug.cgi?id=208224
+ <rdar://problem/58879500>
+
+ Fix Build.
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebFrameView.mm:
+ (+[WebFrameView _viewTypesAllowImageTypeOmission:]):
+ * WebView/WebView.mm:
+ (+[WebView _viewClass:andRepresentationClass:forMIMEType:allowingPlugins:]):
+
2020-02-25 Justin Michaud <[email protected]>
Inline Cache delete by id/val
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm (257399 => 257400)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm 2020-02-26 01:38:46 UTC (rev 257399)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrameView.mm 2020-02-26 01:39:08 UTC (rev 257400)
@@ -258,14 +258,17 @@
// Since this is a "secret default" we don't bother registering it.
BOOL omitPDFSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
- if (!omitPDFSupport)
+ if (!omitPDFSupport) {
#if PLATFORM(IOS_FAMILY)
#define WebPDFView ([WebView _getPDFViewClass])
#endif
+#if !PLATFORM(MACCATALYST)
addTypesFromClass(viewTypes, [WebPDFView class], [WebPDFView supportedMIMETypes]);
+#endif
#if PLATFORM(IOS_FAMILY)
#undef WebPDFView
#endif
+ }
}
if (!addedImageTypes && !allowImageTypeOmission) {
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (257399 => 257400)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-02-26 01:38:46 UTC (rev 257399)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-02-26 01:39:08 UTC (rev 257400)
@@ -2060,7 +2060,11 @@
#if PLATFORM(IOS_FAMILY)
#define WebPDFView ([WebView _getPDFViewClass])
#endif
+#if PLATFORM(MACCATALYST)
+ if (!viewClass || !repClass) {
+#else
if (!viewClass || !repClass || [[WebPDFView supportedMIMETypes] containsObject:MIMEType]) {
+#endif
#if PLATFORM(IOS_FAMILY)
#undef WebPDFView
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
