Title: [291352] trunk/Source/WebKit
- Revision
- 291352
- Author
- pvol...@apple.com
- Date
- 2022-03-16 08:20:35 -0700 (Wed, 16 Mar 2022)
Log Message
Incorrect header name used in __has_include
https://bugs.webkit.org/show_bug.cgi?id=237914
<rdar://90271228>
Reviewed by Geoffrey Garen.
* Configurations/WebKit.xcconfig:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (291351 => 291352)
--- trunk/Source/WebKit/ChangeLog 2022-03-16 15:17:52 UTC (rev 291351)
+++ trunk/Source/WebKit/ChangeLog 2022-03-16 15:20:35 UTC (rev 291352)
@@ -1,3 +1,15 @@
+2022-03-16 Per Arne Vollan <pvol...@apple.com>
+
+ Incorrect header name used in __has_include
+ https://bugs.webkit.org/show_bug.cgi?id=237914
+ <rdar://90271228>
+
+ Reviewed by Geoffrey Garen.
+
+ * Configurations/WebKit.xcconfig:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+
2022-03-16 Wenson Hsieh <wenson_hs...@apple.com>
[iOS] Refactor some position information hit-testing logic related to data detectors in Live Text
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (291351 => 291352)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-16 15:17:52 UTC (rev 291351)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-16 15:20:35 UTC (rev 291352)
@@ -152,7 +152,7 @@
WK_LIBNETWORKEXTENSION_LDFLAGS_macosx = -weak_library /usr/lib/libnetworkextension.dylib;
WK_LIBNETWORKEXTENSION_LDFLAGS_tvos = ;
-WK_AVKIT_LDFLAGS = $(WK_AVKIT_LDFLAGS$(WK_PLATFORM_NAME));
+WK_AVKIT_LDFLAGS = $(WK_AVKIT_LDFLAGS_$(WK_PLATFORM_NAME));
WK_AVKIT_LDFLAGS_iphoneos = -framework AVKit;
WK_AVKIT_LDFLAGS_iphonesimulator = -framework AVKit;
WK_AVKIT_LDFLAGS_maccatalyst = -framework AVKit;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (291351 => 291352)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-16 15:17:52 UTC (rev 291351)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-16 15:20:35 UTC (rev 291352)
@@ -113,8 +113,8 @@
#import "WKStylusDeviceObserver.h"
#endif
-#if __has_include(<AVKit/AVKitPictureInPictureController.h>)
-#import <AVKit/AVKitPictureInPictureController.h>
+#if __has_include(<AVKit/AVPictureInPictureController.h>)
+#import <AVKit/AVPictureInPictureController.h>
#endif
#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
@@ -420,7 +420,7 @@
#if PLATFORM(IOS_FAMILY)
parameters.currentUserInterfaceIdiomIsSmallScreen = currentUserInterfaceIdiomIsSmallScreen();
-#if ENABLE(VIDEO_PRESENTATION_MODE) && __has_include(<AVKit/AVKitPictureInPictureController.h>)
+#if ENABLE(VIDEO_PRESENTATION_MODE) && !PLATFORM(WATCHOS) && __has_include(<AVKit/AVPictureInPictureController.h>)
parameters.supportsPictureInPicture = [AVPictureInPictureController isPictureInPictureSupported];
#else
parameters.supportsPictureInPicture = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
