Skip to content

Commit

Permalink
Cherry-pick b976b6b. rdar://124008037
Browse files Browse the repository at this point in the history 
    Enable WebKit process extensions on newer OS versions
    https://bugs.webkit.org/show_bug.cgi?id=270444
    rdar://124008037

    Reviewed by Chris Dumez.

    * Source/WebKit/Configurations/BaseExtension.xcconfig:
    * Source/WebKit/Configurations/BaseXPCService.xcconfig:
    * Source/WebKit/Configurations/GPUService.xcconfig:
    * Source/WebKit/Configurations/NetworkService.xcconfig:
    * Source/WebKit/Configurations/WebContentService.xcconfig:
    * Source/WebKit/Configurations/WebKit.xcconfig:

    Canonical link: https://commits.webkit.org/275857@main

Identifier: 276246.9@safari-7619.1.6-branch
  • Loading branch information
@pvollan @MyahCobbs
pvollan authored and MyahCobbs committed Mar 22, 2024
1 parent 51e7e4e commit 4320d68
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Source/WTF/wtf/PlatformUse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,10 @@
#define USE_SANDBOX_VERSION_3 1
#endif

#if !defined(USE_EXTENSIONKIT) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400
#define USE_EXTENSIONKIT 1
#endif

#if !defined(USE_BROWSERENGINEKIT) && PLATFORM(IOS) && __has_include(<BrowserEngineKit/BETextInput.h>)
#define USE_BROWSERENGINEKIT 1
#endif
Expand Down
2 changes: 0 additions & 2 deletions Source/WebKit/Configurations/BaseExtension.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=iphone*17.0*] = ;
SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=iphone*17.1*] = ;
SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=iphone*17.2*] = ;
SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=iphone*17.3*] = ;
SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=iphone*18.0*] = ;
SWIFT_OBJC_BRIDGING_HEADER_YES[sdk=xr*] = ;
SWIFT_VERSION = 5.0;
SWIFT_OPTIMIZATION_LEVEL = -O;
Expand All @@ -52,7 +51,6 @@ EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=iphone*17.0*] = *;
EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=iphone*17.1*] = *;
EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=iphone*17.2*] = *;
EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=iphone*17.3*] = *;
EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=iphone*18.0*] = *;
EXCLUDED_SOURCE_FILE_NAMES_YES[sdk=xr*] = *;

CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/Configurations/BaseXPCService.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ SKIP_INSTALL[sdk=iphone*17.0*] = NO;
SKIP_INSTALL[sdk=iphone*17.1*] = NO;
SKIP_INSTALL[sdk=iphone*17.2*] = NO;
SKIP_INSTALL[sdk=iphone*17.3*] = NO;
SKIP_INSTALL[sdk=iphone*18.0*] = NO;
SKIP_INSTALL[sdk=xr*] = NO;
SKIP_INSTALL[sdk=appletv*] = NO;
SKIP_INSTALL[sdk=watch*] = NO;
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/Configurations/GPUService.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.1*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.2*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.3*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator18.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=watchsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=xrsimulator*] = $(PRODUCT_NAME);
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/Configurations/NetworkService.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.1*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.2*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.3*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator18.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=watchsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=xrsimulator*] = $(PRODUCT_NAME);
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/Configurations/WebContentService.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.1*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.2*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator17.3*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=iphonesimulator18.0*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=watchsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvsimulator*] = $(PRODUCT_NAME);
PRODUCT_BUNDLE_IDENTIFIER[sdk=xrsimulator*] = $(PRODUCT_NAME);
Expand Down
1 change: 0 additions & 1 deletion Source/WebKit/Configurations/WebKit.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=iphone*17.0.internal] = ;
INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=iphone*17.1.internal] = ;
INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=iphone*17.2.internal] = ;
INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=iphone*17.3.internal] = ;
INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=iphone*18.0.internal] = ;
INCLUDED_EXTENSION_SOURCE_FILE_NAMES_YES[sdk=xr*] = ;

EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES) $(EXCLUDED_MIGRATED_HEADERS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)) $(WK_EXCLUDED_WEBPUSHD_SANDBOX) $(EXCLUDED_EXTENSION_SOURCE_FILE_NAMES);
Expand Down

0 comments on commit 4320d68

Please sign in to comment.