Title: [279418] branches/safari-612.1.21-branch/Source
Revision
279418
Author
[email protected]
Date
2021-06-30 09:43:35 -0700 (Wed, 30 Jun 2021)

Log Message

Cherry-pick r279392. rdar://problem/79970322

    WebKit_iosmac build failure: SystemPreviewSPI.h:29:9: fatal error: 'AssetViewer/ARQuickLookWebKitItem.h' file not found
    https://bugs.webkit.org/show_bug.cgi?id=227507
    <rdar://problem/79902043>

    Reviewed by Dean Jackson.

    When we added new SPIs in Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h as part of r279312 we also included this file
    from a new file that is compiled on Catalyst. This revealed an issue where existing SPIs included in that file weren't
    actually available on Catalyst. We now make sure we compile those out on Catalyst.

    Source/WebCore/PAL:

    * pal/spi/ios/SystemPreviewSPI.h:

    Source/WTF:

    * wtf/PlatformHave.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612.1.21-branch/Source/WTF/ChangeLog (279417 => 279418)


--- branches/safari-612.1.21-branch/Source/WTF/ChangeLog	2021-06-30 16:43:32 UTC (rev 279417)
+++ branches/safari-612.1.21-branch/Source/WTF/ChangeLog	2021-06-30 16:43:35 UTC (rev 279418)
@@ -1,5 +1,44 @@
 2021-06-30  Alan Coon  <[email protected]>
 
+        Cherry-pick r279392. rdar://problem/79970322
+
+    WebKit_iosmac build failure: SystemPreviewSPI.h:29:9: fatal error: 'AssetViewer/ARQuickLookWebKitItem.h' file not found
+    https://bugs.webkit.org/show_bug.cgi?id=227507
+    <rdar://problem/79902043>
+    
+    Reviewed by Dean Jackson.
+    
+    When we added new SPIs in Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h as part of r279312 we also included this file
+    from a new file that is compiled on Catalyst. This revealed an issue where existing SPIs included in that file weren't
+    actually available on Catalyst. We now make sure we compile those out on Catalyst.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/ios/SystemPreviewSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-06-29  Antoine Quint  <[email protected]>
+
+            WebKit_iosmac build failure: SystemPreviewSPI.h:29:9: fatal error: 'AssetViewer/ARQuickLookWebKitItem.h' file not found
+            https://bugs.webkit.org/show_bug.cgi?id=227507
+            <rdar://problem/79902043>
+
+            Reviewed by Dean Jackson.
+
+            When we added new SPIs in Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h as part of r279312 we also included this file
+            from a new file that is compiled on Catalyst. This revealed an issue where existing SPIs included in that file weren't
+            actually available on Catalyst. We now make sure we compile those out on Catalyst.
+
+            * wtf/PlatformHave.h:
+
+2021-06-30  Alan Coon  <[email protected]>
+
         Cherry-pick r279365. rdar://problem/79969742
 
     Enable Probabilistic Guard Malloc for RuleData and RuleFeature vectors

Modified: branches/safari-612.1.21-branch/Source/WTF/wtf/PlatformHave.h (279417 => 279418)


--- branches/safari-612.1.21-branch/Source/WTF/wtf/PlatformHave.h	2021-06-30 16:43:32 UTC (rev 279417)
+++ branches/safari-612.1.21-branch/Source/WTF/wtf/PlatformHave.h	2021-06-30 16:43:35 UTC (rev 279418)
@@ -489,7 +489,7 @@
 #define HAVE_CTFONTCREATEFORCHARACTERSWITHLANGUAGEANDOPTION 1
 #endif
 
-#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
+#if PLATFORM(IOS)
 #define HAVE_ARKIT_QUICK_LOOK_PREVIEW_ITEM 1
 #endif
 

Modified: branches/safari-612.1.21-branch/Source/WebCore/PAL/ChangeLog (279417 => 279418)


--- branches/safari-612.1.21-branch/Source/WebCore/PAL/ChangeLog	2021-06-30 16:43:32 UTC (rev 279417)
+++ branches/safari-612.1.21-branch/Source/WebCore/PAL/ChangeLog	2021-06-30 16:43:35 UTC (rev 279418)
@@ -1,3 +1,42 @@
+2021-06-30  Alan Coon  <[email protected]>
+
+        Cherry-pick r279392. rdar://problem/79970322
+
+    WebKit_iosmac build failure: SystemPreviewSPI.h:29:9: fatal error: 'AssetViewer/ARQuickLookWebKitItem.h' file not found
+    https://bugs.webkit.org/show_bug.cgi?id=227507
+    <rdar://problem/79902043>
+    
+    Reviewed by Dean Jackson.
+    
+    When we added new SPIs in Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h as part of r279312 we also included this file
+    from a new file that is compiled on Catalyst. This revealed an issue where existing SPIs included in that file weren't
+    actually available on Catalyst. We now make sure we compile those out on Catalyst.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/ios/SystemPreviewSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@279392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-06-29  Antoine Quint  <[email protected]>
+
+            WebKit_iosmac build failure: SystemPreviewSPI.h:29:9: fatal error: 'AssetViewer/ARQuickLookWebKitItem.h' file not found
+            https://bugs.webkit.org/show_bug.cgi?id=227507
+            <rdar://problem/79902043>
+
+            Reviewed by Dean Jackson.
+
+            When we added new SPIs in Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h as part of r279312 we also included this file
+            from a new file that is compiled on Catalyst. This revealed an issue where existing SPIs included in that file weren't
+            actually available on Catalyst. We now make sure we compile those out on Catalyst.
+
+            * pal/spi/ios/SystemPreviewSPI.h:
+
 2021-06-28  Jean-Yves Avenard  <[email protected]>
 
         Not all uses of AudioToolbox framework use soft linking

Modified: branches/safari-612.1.21-branch/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h (279417 => 279418)


--- branches/safari-612.1.21-branch/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h	2021-06-30 16:43:32 UTC (rev 279417)
+++ branches/safari-612.1.21-branch/Source/WebCore/PAL/pal/spi/ios/SystemPreviewSPI.h	2021-06-30 16:43:35 UTC (rev 279418)
@@ -29,7 +29,9 @@
 #import <AssetViewer/ARQuickLookWebKitItem.h>
 #endif
 
+#if PLATFORM(IOS)
 #import <AssetViewer/ASVThumbnailView.h>
+#endif
 
 #if HAVE(ARKIT_INLINE_PREVIEW_IOS)
 #import <AssetViewer/ASVInlinePreview.h>
@@ -39,6 +41,7 @@
 
 #import <UIKit/UIKit.h>
 
+#if PLATFORM(IOS)
 @class ASVThumbnailView;
 @class QLItem;
 @class QLPreviewController;
@@ -52,6 +55,7 @@
 @property (nonatomic, assign) QLItem *thumbnailItem;
 @property (nonatomic) CGSize maxThumbnailSize;
 @end
+#endif
 
 #if HAVE(ARKIT_QUICK_LOOK_PREVIEW_ITEM)
 #import <ARKit/ARKit.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to