Title: [291488] branches/safari-614.1.6-branch/Source/WebKit
- Revision
- 291488
- Author
- [email protected]
- Date
- 2022-03-18 11:06:49 -0700 (Fri, 18 Mar 2022)
Log Message
Cherry-pick r291429. rdar://problem/90445115
Unreviewed, reverting r291352.
https://bugs.webkit.org/show_bug.cgi?id=238039
Disruptive change
Reverted changeset:
"Incorrect header name used in __has_include"
https://bugs.webkit.org/show_bug.cgi?id=237914
https://commits.webkit.org/r291352
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-614.1.6-branch/Source/WebKit/ChangeLog (291487 => 291488)
--- branches/safari-614.1.6-branch/Source/WebKit/ChangeLog 2022-03-18 16:45:44 UTC (rev 291487)
+++ branches/safari-614.1.6-branch/Source/WebKit/ChangeLog 2022-03-18 18:06:49 UTC (rev 291488)
@@ -1,3 +1,33 @@
+2022-03-18 Russell Epstein <[email protected]>
+
+ Cherry-pick r291429. rdar://problem/90445115
+
+ Unreviewed, reverting r291352.
+ https://bugs.webkit.org/show_bug.cgi?id=238039
+
+ Disruptive change
+
+ Reverted changeset:
+
+ "Incorrect header name used in __has_include"
+ https://bugs.webkit.org/show_bug.cgi?id=237914
+ https://commits.webkit.org/r291352
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@291429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-17 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r291352.
+ https://bugs.webkit.org/show_bug.cgi?id=238039
+
+ Disruptive change
+
+ Reverted changeset:
+
+ "Incorrect header name used in __has_include"
+ https://bugs.webkit.org/show_bug.cgi?id=237914
+ https://commits.webkit.org/r291352
+
2022-03-17 Russell Epstein <[email protected]>
Cherry-pick r291433. rdar://problem/90431433
Modified: branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig (291487 => 291488)
--- branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-18 16:45:44 UTC (rev 291487)
+++ branches/safari-614.1.6-branch/Source/WebKit/Configurations/WebKit.xcconfig 2022-03-18 18:06:49 UTC (rev 291488)
@@ -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 (291487 => 291488)
--- branches/safari-614.1.6-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-18 16:45:44 UTC (rev 291487)
+++ branches/safari-614.1.6-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-03-18 18:06:49 UTC (rev 291488)
@@ -113,8 +113,8 @@
#import "WKStylusDeviceObserver.h"
#endif
-#if __has_include(<AVKit/AVPictureInPictureController.h>)
-#import <AVKit/AVPictureInPictureController.h>
+#if __has_include(<AVKit/AVKitPictureInPictureController.h>)
+#import <AVKit/AVKitPictureInPictureController.h>
#endif
#if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
@@ -420,7 +420,7 @@
#if PLATFORM(IOS_FAMILY)
parameters.currentUserInterfaceIdiomIsSmallScreen = currentUserInterfaceIdiomIsSmallScreen();
-#if ENABLE(VIDEO_PRESENTATION_MODE) && !PLATFORM(WATCHOS) && __has_include(<AVKit/AVPictureInPictureController.h>)
+#if ENABLE(VIDEO_PRESENTATION_MODE) && __has_include(<AVKit/AVKitPictureInPictureController.h>)
parameters.supportsPictureInPicture = [AVPictureInPictureController isPictureInPictureSupported];
#else
parameters.supportsPictureInPicture = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
