Changeset 268887 in webkit

Timestamp:

Oct 22, 2020, 1:29:14 PM (6 years ago)

Author:

Russell Epstein

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

Location:

branches/safari-610.2.11.51-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformEnableCocoa.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Configurations/WebKit.xcconfig (modified) (1 diff)

branches/safari-610.2.11.51-branch/Source/WTF/ChangeLog

@@ +1 @@
+2020-10-22  Russell Epstein  <repstein@apple.com>
+
+        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  <aestes@apple.com>
+
+            [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  <bshafiei@apple.com>
 

branches/safari-610.2.11.51-branch/Source/WTF/wtf/PlatformEnableCocoa.h

@@ -595 +595 @@
 #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

branches/safari-610.2.11.51-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-22  Russell Epstein  <repstein@apple.com>
+
+        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  <aestes@apple.com>
+
+            [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  <kocsen_chung@apple.com>
 

branches/safari-610.2.11.51-branch/Source/WebKit/Configurations/WebKit.xcconfig

@@ -94 +94 @@
 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));