Title: [293228] trunk/Source/WebCore/PAL
- Revision
- 293228
- Author
- commit-qu...@webkit.org
- Date
- 2022-04-22 09:36:51 -0700 (Fri, 22 Apr 2022)
Log Message
Adjust SPI headers to fix build with non-internal SDK
https://bugs.webkit.org/show_bug.cgi?id=239626
Patch by Alex Christensen <achristen...@webkit.org> on 2022-04-22
Reviewed by Chris Dumez.
* pal/spi/cocoa/PassKitSPI.h:
* pal/spi/mac/ScreenCaptureKitSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (293227 => 293228)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-04-22 16:33:36 UTC (rev 293227)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-04-22 16:36:51 UTC (rev 293228)
@@ -1,3 +1,13 @@
+2022-04-22 Alex Christensen <achristen...@webkit.org>
+
+ Adjust SPI headers to fix build with non-internal SDK
+ https://bugs.webkit.org/show_bug.cgi?id=239626
+
+ Reviewed by Chris Dumez.
+
+ * pal/spi/cocoa/PassKitSPI.h:
+ * pal/spi/mac/ScreenCaptureKitSPI.h:
+
2022-04-20 Myles C. Maxfield <mmaxfi...@apple.com>
[WebGPU] WebKit and WebKitLegacy shouldn't need to know about WebGPU.framework
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (293227 => 293228)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2022-04-22 16:33:36 UTC (rev 293227)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2022-04-22 16:36:51 UTC (rev 293228)
@@ -24,7 +24,7 @@
*/
#if HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)
-#if HAVE(PASSKIT_MODULARIZATION)
+#if HAVE(PASSKIT_MODULARIZATION) && USE(APPLE_INTERNAL_SDK)
#import <PassKitCore/PKRecurringPaymentSummaryItem.h>
#else
#import <PassKit/PKRecurringPaymentSummaryItem.h>
@@ -32,7 +32,7 @@
#endif
#if HAVE(PASSKIT_DEFERRED_SUMMARY_ITEM)
-#if HAVE(PASSKIT_MODULARIZATION)
+#if HAVE(PASSKIT_MODULARIZATION) && USE(APPLE_INTERNAL_SDK)
#import <PassKitCore/PKDeferredPaymentSummaryItem.h>
#else
#import <PassKit/PKDeferredPaymentSummaryItem.h>
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h (293227 => 293228)
--- trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h 2022-04-22 16:33:36 UTC (rev 293227)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/ScreenCaptureKitSPI.h 2022-04-22 16:36:51 UTC (rev 293228)
@@ -45,10 +45,8 @@
SCContentFilterTypeClientShouldImplementDefault
};
-@interface SCContentFilter ()
-@property (nonatomic, strong) SCWindow *window;
-@property (nonatomic, strong) SCDisplay *display;
-@property (nonatomic, assign) SCContentFilterType type;
+@interface SCContentFilterDesktopIndependentWindowInformation : NSObject
+@property (nonatomic, readonly) SCWindow *window;
@end
@interface SCContentFilterDisplayInformation : NSObject
@@ -55,8 +53,12 @@
@property (nonatomic, readonly) SCDisplay *display;
@end
-@interface SCContentFilterDesktopIndependentWindowInformation : NSObject
-@property (nonatomic, readonly) SCWindow *window;
+@interface SCContentFilter ()
+@property (nonatomic, strong) SCWindow *window;
+@property (nonatomic, strong) SCDisplay *display;
+@property (nonatomic, assign) SCContentFilterType type;
+@property (nullable, nonatomic, readonly) SCContentFilterDesktopIndependentWindowInformation *desktopIndependentWindowInfo;
+@property (nullable, nonatomic, readonly) SCContentFilterDisplayInformation *displayInfo;
@end
@class SCContentSharingSession;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
