Title: [291379] branches/safari-614.1.6-branch/Source/WebKit
- Revision
- 291379
- Author
- repst...@apple.com
- Date
- 2022-03-16 17:36:45 -0700 (Wed, 16 Mar 2022)
Log Message
Cherry-pick r291352. rdar://problem/90271228
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291352 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.6-branch/Source/WebKit/ChangeLog (291378 => 291379)
--- branches/safari-614.1.6-branch/Source/WebKit/ChangeLog 2022-03-17 00:23:18 UTC (rev 291378)
+++ branches/safari-614.1.6-branch/Source/WebKit/ChangeLog 2022-03-17 00:36:45 UTC (rev 291379)
@@ -1,3 +1,32 @@
+2022-03-16 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r291352. rdar://problem/90271228
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291352 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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-12 Simon Fraser <simon.fra...@apple.com>
In RemoteLayerBackingStore, group makeFrontBufferNonVolatile() and swapToValidFrontBuffer() into a single function
Modified: branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig (291378 => 291379)
--- branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-17 00:23:18 UTC (rev 291378)
+++ branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-17 00:36:45 UTC (rev 291379)
@@ -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: branches/safari-614.1.6-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (291378 => 291379)
--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-17 00:23:18 UTC (rev 291378)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-17 00:36:45 UTC (rev 291379)
@@ -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
