Title: [285910] trunk/Source
- Revision
- 285910
- Author
- drou...@apple.com
- Date
- 2021-11-16 18:39:47 -0800 (Tue, 16 Nov 2021)
Log Message
[iOS] use PhotosUIPrivate instead of PhotosUI
https://bugs.webkit.org/show_bug.cgi?id=233213
<rdar://problem/85300427>
Reviewed by Aditya Keerthi.
Source/WebKit:
* Platform/spi/ios/PhotosUISPI.h:
* UIProcess/ios/forms/WKFileUploadPanel.mm:
Source/WTF:
* wtf/PlatformHave.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (285909 => 285910)
--- trunk/Source/WTF/ChangeLog 2021-11-17 02:13:35 UTC (rev 285909)
+++ trunk/Source/WTF/ChangeLog 2021-11-17 02:39:47 UTC (rev 285910)
@@ -1,3 +1,13 @@
+2021-11-16 Devin Rousso <drou...@apple.com>
+
+ [iOS] use PhotosUIPrivate instead of PhotosUI
+ https://bugs.webkit.org/show_bug.cgi?id=233213
+ <rdar://problem/85300427>
+
+ Reviewed by Aditya Keerthi.
+
+ * wtf/PlatformHave.h:
+
2021-11-15 Sam Weinig <wei...@apple.com>
Add another <model> backend backed by SceneKit to prove out ModelPlayer infrastructure a bit more
Modified: trunk/Source/WTF/wtf/PlatformHave.h (285909 => 285910)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-11-17 02:13:35 UTC (rev 285909)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-11-17 02:39:47 UTC (rev 285910)
@@ -1068,8 +1068,11 @@
#endif
#if PLATFORM(IOS)
-#define HAVE_PUACTIVITYPROGRESSCONTROLLER 1
+#define HAVE_PHOTOS_UI 1
+#if __has_include(<PhotosUIPrivate/PUActivityProgressController.h>)
+#define HAVE_PHOTOS_UI_PRIVATE 1
#endif
+#endif
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) \
|| (((PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
Modified: trunk/Source/WebKit/ChangeLog (285909 => 285910)
--- trunk/Source/WebKit/ChangeLog 2021-11-17 02:13:35 UTC (rev 285909)
+++ trunk/Source/WebKit/ChangeLog 2021-11-17 02:39:47 UTC (rev 285910)
@@ -1,3 +1,14 @@
+2021-11-16 Devin Rousso <drou...@apple.com>
+
+ [iOS] use PhotosUIPrivate instead of PhotosUI
+ https://bugs.webkit.org/show_bug.cgi?id=233213
+ <rdar://problem/85300427>
+
+ Reviewed by Aditya Keerthi.
+
+ * Platform/spi/ios/PhotosUISPI.h:
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+
2021-11-16 Per Arne Vollan <pvol...@apple.com>
[iOS] Reduce telemetry
Modified: trunk/Source/WebKit/Platform/spi/ios/PhotosUISPI.h (285909 => 285910)
--- trunk/Source/WebKit/Platform/spi/ios/PhotosUISPI.h 2021-11-17 02:13:35 UTC (rev 285909)
+++ trunk/Source/WebKit/Platform/spi/ios/PhotosUISPI.h 2021-11-17 02:39:47 UTC (rev 285910)
@@ -25,7 +25,9 @@
#if USE(APPLE_INTERNAL_SDK)
-#if HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#if HAVE(PHOTOS_UI_PRIVATE)
+#import <PhotosUIPrivate/PUActivityProgressController.h>
+#elif HAVE(PHOTOS_UI)
#import <PhotosUI/PUActivityProgressController.h>
#endif
@@ -33,7 +35,7 @@
#import "UIKitSPI.h"
-#if HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#if HAVE(PHOTOS_UI)
@interface PUActivityProgressController : NSObject
@@ -50,6 +52,6 @@
@end
-#endif // HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#endif // HAVE(PHOTOS_UI)
#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (285909 => 285910)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2021-11-17 02:13:35 UTC (rev 285909)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2021-11-17 02:39:47 UTC (rev 285910)
@@ -54,7 +54,10 @@
#import <pal/cocoa/AVFoundationSoftLink.h>
-#if HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#if HAVE(PHOTOS_UI_PRIVATE)
+SOFT_LINK_PRIVATE_FRAMEWORK(PhotosUIPrivate)
+SOFT_LINK_CLASS(PhotosUIPrivate, PUActivityProgressController)
+#elif HAVE(PHOTOS_UI)
SOFT_LINK_FRAMEWORK(PhotosUI)
SOFT_LINK_CLASS(PhotosUI, PUActivityProgressController)
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
