Title: [268887] branches/safari-610.2.11.51-branch/Source
- Revision
- 268887
- Author
- [email protected]
- Date
- 2020-10-22 13:29:14 -0700 (Thu, 22 Oct 2020)
Log Message
Cherry-pick r268367. rdar://problem/70320656
[macCatalyst] Enable WKPDFView
https://bugs.webkit.org/show_bug.cgi?id=217403
<rdar://problem/48217791>
Reviewed by Tim Horton.
Source/WebKit:
* Configurations/WebKit.xcconfig: Linked PDFKit.framework when building for the Catalyst
variant on Big Sur or later.
Source/WTF:
* wtf/PlatformEnableCocoa.h: Enabled WKPDFView when building for the Catalyst variant on
Big Sur or later.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog (268886 => 268887)
--- branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog 2020-10-22 20:20:51 UTC (rev 268886)
+++ branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog 2020-10-22 20:29:14 UTC (rev 268887)
@@ -1,3 +1,37 @@
+2020-10-22 Russell Epstein <[email protected]>
+
+ Cherry-pick r268367. rdar://problem/70320656
+
+ [macCatalyst] Enable WKPDFView
+ https://bugs.webkit.org/show_bug.cgi?id=217403
+ <rdar://problem/48217791>
+
+ Reviewed by Tim Horton.
+
+ Source/WebKit:
+
+ * Configurations/WebKit.xcconfig: Linked PDFKit.framework when building for the Catalyst
+ variant on Big Sur or later.
+
+ Source/WTF:
+
+ * wtf/PlatformEnableCocoa.h: Enabled WKPDFView when building for the Catalyst variant on
+ Big Sur or later.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-12 Andy Estes <[email protected]>
+
+ [macCatalyst] Enable WKPDFView
+ https://bugs.webkit.org/show_bug.cgi?id=217403
+ <rdar://problem/48217791>
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformEnableCocoa.h: Enabled WKPDFView when building for the Catalyst variant on
+ Big Sur or later.
+
2020-10-12 Babak Shafiei <[email protected]>
Cherry-pick r268330. rdar://problem/70189394
Modified: branches/safari-610.2.11.51-branch/Source/WTF/wtf/PlatformEnableCocoa.h (268886 => 268887)
--- branches/safari-610.2.11.51-branch/Source/WTF/wtf/PlatformEnableCocoa.h 2020-10-22 20:20:51 UTC (rev 268886)
+++ branches/safari-610.2.11.51-branch/Source/WTF/wtf/PlatformEnableCocoa.h 2020-10-22 20:29:14 UTC (rev 268887)
@@ -594,6 +594,6 @@
#define ENABLE_WIRELESS_PLAYBACK_TARGET 1
#endif
-#if !defined(ENABLE_WKPDFVIEW) && PLATFORM(IOS)
+#if !defined(ENABLE_WKPDFVIEW) && (PLATFORM(IOS) || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000))
#define ENABLE_WKPDFVIEW 1
#endif
Modified: branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog (268886 => 268887)
--- branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog 2020-10-22 20:20:51 UTC (rev 268886)
+++ branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog 2020-10-22 20:29:14 UTC (rev 268887)
@@ -1,3 +1,37 @@
+2020-10-22 Russell Epstein <[email protected]>
+
+ Cherry-pick r268367. rdar://problem/70320656
+
+ [macCatalyst] Enable WKPDFView
+ https://bugs.webkit.org/show_bug.cgi?id=217403
+ <rdar://problem/48217791>
+
+ Reviewed by Tim Horton.
+
+ Source/WebKit:
+
+ * Configurations/WebKit.xcconfig: Linked PDFKit.framework when building for the Catalyst
+ variant on Big Sur or later.
+
+ Source/WTF:
+
+ * wtf/PlatformEnableCocoa.h: Enabled WKPDFView when building for the Catalyst variant on
+ Big Sur or later.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-12 Andy Estes <[email protected]>
+
+ [macCatalyst] Enable WKPDFView
+ https://bugs.webkit.org/show_bug.cgi?id=217403
+ <rdar://problem/48217791>
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebKit.xcconfig: Linked PDFKit.framework when building for the Catalyst
+ variant on Big Sur or later.
+
2020-10-19 Kocsen Chung <[email protected]>
Cherry-pick r268570. rdar://problem/70447631
Modified: branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/WebKit.xcconfig (268886 => 268887)
--- branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-10-22 20:20:51 UTC (rev 268886)
+++ branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/WebKit.xcconfig 2020-10-22 20:29:14 UTC (rev 268887)
@@ -93,6 +93,8 @@
WK_PDFKIT_LDFLAGS_iphoneos[sdk=iphone*11.*] = ;
WK_PDFKIT_LDFLAGS_iphonesimulator = $(WK_PDFKIT_LDFLAGS_iphoneos);
WK_PDFKIT_LDFLAGS_iphonesimulator[sdk=iphone*11.*] = ;
+WK_PDFKIT_LDFLAGS_maccatalyst = $(WK_PDFKIT_LDFLAGS_maccatalyst$(WK_MACOS_1100));
+WK_PDFKIT_LDFLAGS_maccatalyst_SINCE_1100 = $(WK_PDFKIT_LDFLAGS_iphoneos);
WK_SAFE_BROWSING_LDFLAGS = $(WK_SAFE_BROWSING_LDFLAGS_$(WK_PLATFORM_NAME));
WK_SAFE_BROWSING_LDFLAGS_iphoneos = -framework SafariSafeBrowsing;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
