Changeset 285910 in webkit

Timestamp:

Nov 16, 2021, 6:39:47 PM (5 years ago)

Author:

Devin Rousso

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:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/ios/PhotosUISPI.h (modified) (3 diffs)
• WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-11-16  Devin Rousso  <drousso@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  <weinig@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-16  Devin Rousso  <drousso@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  <pvollan@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/PhotosUISPI.h

@@ -26 +26 @@
 #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
@@ -34 +36 @@
 #import "UIKitSPI.h"
 
-#if HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#if HAVE(PHOTOS_UI)
 
 @interface PUActivityProgressController : NSObject
@@ -51 +53 @@
 @end
 
-#endif // HAVE(PUACTIVITYPROGRESSCONTROLLER)
+#endif // HAVE(PHOTOS_UI)
 
 #endif // USE(APPLE_INTERNAL_SDK)

trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -55 +55 @@
 #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)