Skip to content

Commit ac8c421

Browse files
JonWBedardJonWBedard
committed
Unreviewed, reverting 300969@main (77271dc)
https://bugs.webkit.org/show_bug.cgi?id=300161 rdar://161940776 REGRESSION(300969@main): Broke Internal iOS Debug builds Reverted change: [TestWebKitAPI] Fix the public iOS 26 build https://bugs.webkit.org/show_bug.cgi?id=300036 300969@main (77271dc) Canonical link: https://commits.webkit.org/300988@main
1 parent 3458472 commit ac8c421

6 files changed

Lines changed: 271 additions & 9 deletions

File tree

‎Configurations/CommonBase.xcconfig‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,10 @@ WK_DEFAULT_WK_AUDIT_SPI[sdk=iphoneos18*.internal] = ;
8484

8585
WK_AUDIT_SPI = $(WK_DEFAULT_WK_AUDIT_SPI);
8686

87-
WK_OTHER_AUDIT_SPI_FLAGS = $(WK_OTHER_AUDIT_SPI_FLAGS_148943382) $(WK_OTHER_AUDIT_SPI_FLAGS_$(CONFIGURATION));
87+
WK_OTHER_AUDIT_SPI_FLAGS = -DSDKDB_HAS_148943382 $(WK_OTHER_AUDIT_SPI_FLAGS_$(CONFIGURATION));
88+
WK_OTHER_AUDIT_SPI_FLAGS[sdk=iphoneos18*] = $(WK_OTHER_AUDIT_SPI_FLAGS_$(CONFIGURATION));
8889
WK_OTHER_AUDIT_SPI_FLAGS_Release = -DNDEBUG;
8990
WK_OTHER_AUDIT_SPI_FLAGS_Production = -DNDEBUG;
90-
WK_OTHER_AUDIT_SPI_FLAGS_148943382[sdk=*.internal] = -DSDKDB_HAS_148943382;
91-
WK_OTHER_AUDIT_SPI_FLAGS_148943382[sdk=iphoneos18*] = ;
9291

9392
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
9493

‎Source/WebCore/Configurations/AllowedSPI-legacy.toml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ selectors = [
1616
]
1717
requires = ["ENABLE_MULTI_REPRESENTATION_HEIC"]
1818

19-
# This is SPI, but it's marked as public on 26.x releases due to rdar://148943382.
19+
# -isSystemVoice is SPI, but it's marked as public on internal builds of 26.x
20+
# releases due to rdar://148943382.
2021
[[legacy]]
21-
selectors = [
22-
{ name = "isSystemVoice", class = "?" },
23-
]
22+
selectors = [{ name = "isSystemVoice", class = "?" }]
2423
requires = ["!SDKDB_HAS_148943382"]
2524

25+
[[legacy]]
26+
selectors = [{ name = "isSystemVoice", class = "?" }]
27+
requires = ["!USE_APPLE_INTERNAL_SDK"]
28+
2629
[[legacy]]
2730
classes = [
2831
"WCRBrowserEngineClient",

‎Tools/TestRunnerShared/spi/UIKitSPIForTesting.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ WTF_EXTERN_C_END
131131

132132
@protocol UITextInputPrivate <UITextInput, UITextInputTraits_Private>
133133
- (UITextInputTraits *)textInputTraits;
134-
- (void)insertText:(NSString *)text;
135134
- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion;
136135
- (void)handleKeyWebEvent:(WebEvent *)theEvent withCompletionHandler:(void (^)(WebEvent *, BOOL))completionHandler;
137136
- (NSDictionary *)_autofillContext;

‎Tools/TestWebKitAPI/Tests/WebKit Swift/TestWebKitAPIBundle-Bridging-Header.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,4 @@
2626
#import "../../TestPDFDocument.h"
2727
#import "../WebKitCocoa/SmartListsSupport.h"
2828
#import "TestWKWebView.h"
29-
#import "UIKitSPIForTesting.h"
3029
#import <pal/spi/cg/CoreGraphicsSPI.h>

‎WebKitLibraries/SDKs/iphoneos26.0-additions.sdk/System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore.tbd‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
--- !tapi-tbd
2+
tbd-version: 4
3+
targets: [arm64-ios, arm64e-ios]
4+
install-name: /System/Library/PrivateFrameworks/UIKitCore.framework/UIKitCore
5+
current-version: 9088.1.103
6+
swift-abi-version: 7
7+
reexported-libraries:
8+
- targets: [arm64-ios, arm64e-ios]
9+
libraries: [/System/Library/PrivateFrameworks/CollectionViewCore.framework/CollectionViewCore, /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation,
10+
/System/Library/SubFrameworks/UIUtilities.framework/UIUtilities]
11+
exports:
12+
- targets: [arm64-ios, arm64e-ios]
13+
symbols: [_$s10Foundation15AttributeScopesO5UIKitE0D10AttributesV04FontB0OAA19AttributedStringKeyADMc, _$s10Foundation15AttributeScopesO5UIKitE0D10AttributesV04FontB0OMn,
14+
_$s10Foundation15AttributeScopesO5UIKitE0D10AttributesV04FontB0ON, _$s10Foundation15AttributeScopesO5UIKitE0D10AttributesV4fontAF04FontB0Ovg,
15+
_$s10Foundation15AttributeScopesO5UIKitE0D10AttributesV4fontAF04FontB0OvpMV, _$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVMa,
16+
_$s10Foundation15AttributeScopesO5UIKitE0D10AttributesVMn, _$s10Foundation22AttributeDynamicLookupO5UIKitE13dynamicMemberxs7KeyPathCyAA0B6ScopesOADE0E10AttributesVxG_tcAA016AttributedStringH0Rzluig,
17+
_$s10Foundation22AttributeDynamicLookupO5UIKitE13dynamicMemberxs7KeyPathCyAA0B6ScopesOADE0E10AttributesVxG_tcAA016AttributedStringH0RzluipMV,
18+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C2idAC0C2IDVvgTj, _$s5UIKit16UITextEffectViewC015ReplacementTextC0C5chunk4view8delegate9fromColorAeA0bcF5ChunkC_AcE8Delegate_pSo7UIColorCtcfC,
19+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegateMp, _$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegateP011replacementC11DidCompleteyyAEFTq,
20+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegateP015performAnimatedE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaFTq,
21+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegateP07performE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaFTq,
22+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegateP07performE18AndGeneratePreview3for6effect9animationSo010UITargetedK0CSgAA0bcF5ChunkC_A2E19AnimationParametersVtYaFTq,
23+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegatePAAE015performAnimatedE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaF,
24+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegatePAAE015performAnimatedE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaFTu,
25+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegatePAAE07performE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaF,
26+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0C8DelegatePAAE07performE03for6effect9animationyAA0bcF5ChunkC_A2E19AnimationParametersVtYaFTu,
27+
_$s5UIKit16UITextEffectViewC015ReplacementTextC0CAC0fC0AAWP, _$s5UIKit16UITextEffectViewC015ReplacementTextC0CMa,
28+
_$s5UIKit16UITextEffectViewC03addC0yAC0C2IDVAC04TextC0_pFTj, _$s5UIKit16UITextEffectViewC06removeC0yyAC0C2IDVFTj,
29+
_$s5UIKit16UITextEffectViewC09PonderingC0C2idAC0C2IDVvgTj, _$s5UIKit16UITextEffectViewC09PonderingC0C5chunk4view18lightConfigurationAeA0bC9TextChunkC_AcA018UIDirectionalLightcD0C0I0VtcfC,
30+
_$s5UIKit16UITextEffectViewC09PonderingC0CAC04TextC0AAWP, _$s5UIKit16UITextEffectViewC09PonderingC0CMa, _$s5UIKit16UITextEffectViewC0C2IDV2eeoiySbAE_AEtFZ,
31+
_$s5UIKit16UITextEffectViewC0C2IDVMa, _$s5UIKit16UITextEffectViewC0C2IDVMn, _$s5UIKit16UITextEffectViewC0C2IDVSHAAMc,
32+
_$s5UIKit16UITextEffectViewC16removeAllEffectsyyFTj, _$s5UIKit16UITextEffectViewC6sourceAcA0bcD6Source_p_tcfC,
33+
_$s5UIKit16UITextEffectViewCMa, _$s5UIKit16UITextEffectViewCMn, _$s5UIKit21UITextEffectTextChunkCMn, _$s5UIKit28UIDirectionalLightEffectViewC13ConfigurationV9fillColorSo7UIColorCvg,
34+
_$s5UIKit28UIDirectionalLightEffectViewC13ConfigurationV9ponderingAEvgZ, _$s5UIKit28UIDirectionalLightEffectViewC13ConfigurationVMa,
35+
_NSStringFromCGRect, _NSStringFromCGSize, _NSStringFromUIEdgeInsets, _UIAccessibilityGrayscaleStatusDidChangeNotification,
36+
_UIAccessibilityInvertColorsStatusDidChangeNotification, _UIAccessibilityReduceMotionStatusDidChangeNotification,
37+
_UIAccessibilityTraitHeader, _UIApplicationDidBecomeActiveNotification, _UIApplicationDidChangeStatusBarFrameNotification,
38+
_UIApplicationDidChangeStatusBarOrientationNotification, _UIApplicationDidEnterBackgroundNotification, _UIApplicationDidFinishLaunchingNotification,
39+
_UIApplicationInitialize, _UIApplicationInstantiateSingleton, _UIApplicationLaunchOptionsSourceApplicationKey,
40+
_UIApplicationLaunchOptionsURLKey, _UIApplicationMain, _UIApplicationWillEnterForegroundNotification, _UIApplicationWillResignActiveNotification,
41+
_UIBacklightLevelChangedNotification, _UIContentSizeCategoryDidChangeNotification, _UIEdgeInsetsAdd, _UIEdgeInsetsZero,
42+
_UIFontTextStyleBody, _UIFontTextStyleFootnote, _UIFontTextStyleHeadline, _UIFontTextStyleLargeTitle, _UIFontTextStyleSubheadline,
43+
_UIFontTextStyleTitle1, _UIFontTextStyleTitle3, _UIGraphicsBeginImageContext, _UIGraphicsBeginImageContextWithOptions,
44+
_UIGraphicsBeginPDFContextToData, _UIGraphicsBeginPDFPage, _UIGraphicsEndImageContext, _UIGraphicsEndPDFContext,
45+
_UIGraphicsGetCurrentContext, _UIGraphicsGetImageFromCurrentImageContext, _UIGraphicsGetPDFContextBounds,
46+
_UIGraphicsPopContext, _UIGraphicsPushContext, _UIImageDataWriteToSavedPhotosAlbum, _UIImageJPEGRepresentation,
47+
_UIImagePNGRepresentation, _UIImagePickerControllerImageURL, _UIImagePickerControllerMediaType, _UIImagePickerControllerMediaURL,
48+
_UIImagePickerControllerOriginalImage, _UIKeyInputEscape, _UIKeyboardDidChangeFrameNotification, _UIKeyboardDidHideNotification,
49+
_UIKeyboardDidShowNotification, _UIKeyboardEnabledInputModesAllowChineseTransliterationForText, _UIKeyboardEnabledInputModesAllowOneToManyShortcuts,
50+
_UIKeyboardFrameEndUserInfoKey, _UIKeyboardIsLocalUserInfoKey, _UIKeyboardIsRightToLeftInputModeActive, _UIKeyboardPrivateDidRequestDismissalNotification,
51+
_UIKeyboardWillChangeFrameNotification, _UIKeyboardWillHideNotification, _UIKeyboardWillShowNotification,
52+
_UILayoutFittingCompressedSize, _UIMenuControllerDidHideMenuNotification, _UIMenuControllerDidShowMenuNotification,
53+
_UIMenuControllerWillHideMenuNotification, _UIMenuFormat, _UIMenuRoot, _UIMenuShare, _UIPasteboardChangedNotification,
54+
_UIPasteboardChangedTypesAddedKey, _UIPasteboardNameGeneral, _UIPasteboardTypeListImage, _UIPasteboardTypeListString,
55+
_UIPresentationControllerDismissalTransitionDidEndCompletedKey, _UIPresentationControllerDismissalTransitionDidEndNotification,
56+
_UIPreviewDataAttachmentIndex, _UIPreviewDataAttachmentList, _UIPreviewDataAttachmentListIsContentManaged,
57+
_UIPreviewDataDDContext, _UIPreviewDataDDResult, _UIPreviewDataLink, _UIRectFill, _UISceneDidEnterBackgroundNotification,
58+
_UISceneWillEnterForegroundNotification, _UIScreenCapturedDidChangeNotification, _UIScrollViewDecelerationRateFast,
59+
_UIScrollViewDecelerationRateNormal, _UITextContentTypeAddressCity, _UITextContentTypeAddressState, _UITextContentTypeCellularEID,
60+
_UITextContentTypeCellularIMEI, _UITextContentTypeCountryName, _UITextContentTypeEmailAddress, _UITextContentTypeFamilyName,
61+
_UITextContentTypeFullStreetAddress, _UITextContentTypeGivenName, _UITextContentTypeJobTitle, _UITextContentTypeMiddleName,
62+
_UITextContentTypeName, _UITextContentTypeNamePrefix, _UITextContentTypeNameSuffix, _UITextContentTypeNickname,
63+
_UITextContentTypeOneTimeCode, _UITextContentTypeOrganizationName, _UITextContentTypePassword, _UITextContentTypePostalCode,
64+
_UITextContentTypeStreetAddressLine1, _UITextContentTypeStreetAddressLine2, _UITextContentTypeSublocality,
65+
_UITextContentTypeTelephoneNumber, _UITextContentTypeURL, _UITextContentTypeUsername, _UITransitionContextFromViewKey,
66+
_UITransitionContextToViewKey, _UIWebViewGrowsAndShrinksToFitHeight, _UIWebViewScalesToFitScale, _UIWebViewStandardViewportWidth,
67+
_UIWindowDidBecomeKeyNotification, _UIWindowDidMoveToScreenNotification, _UIWindowDidRotateNotification, _UIWindowLevelNormal,
68+
_UIWindowNewScreenUserInfoKey, _UIWindowWillRotateNotification, __UIApplicationIsExtension, __UIApplicationLoadWebKit,
69+
__UIDragInteractionDefaultLiftDelay, __UISceneDidCompleteSystemSnapshotSequence, __UISceneWillBeginSystemSnapshotSequence,
70+
__UISolariumEnabled, __UIWindowSceneEnhancedWindowingModeChanged, __swift_FORCE_LOAD_$_swiftUIKit]
71+
objc-classes: [UIAction, UIAlertAction, UIAlertController, UIApplication, UIApplicationRotationFollowingControllerNoTouches,
72+
UIApplicationRotationFollowingWindow, UIBarButtonItem, UIBarButtonItemGroup, UIBezierPath, UIBlurEffect, UIButton,
73+
UIButtonConfiguration, UICalendarSelectionWeekOfYear, UICalendarView, UIColor, UIColorPickerViewController,
74+
UICommand, UIContextMenuConfiguration, UIContextMenuInteraction, UIControl, UIDatePicker, UIDevice, UIDocumentPasswordView,
75+
UIDocumentPickerViewController, UIDragInteraction, UIDragItem, UIDragPreview, UIDragPreviewParameters, UIDragPreviewTarget,
76+
UIDropInteraction, UIDropProposal, UIEvent, UIEventAttribution, UIFindInteraction, UIGestureRecognizer, UIGlassEffect,
77+
UIGraphicsImageRenderer, UIHoverGestureRecognizer, UIImage, UIImageAsset, UIImagePickerController, UIImageSymbolConfiguration,
78+
UIImageView, UIImpactFeedbackGenerator, UIIndirectScribbleInteraction, UIInputSuggestion, UIInputView, UIKeyCommand,
79+
UIKeyboard, UIKeyboardImpl, UIKeyboardInputMode, UIKeyboardInputModeController, UIKeyboardPreferencesController,
80+
UILabel, UILayoutGuide, UILongPressGestureRecognizer, UIMailConversationContext, UIMenu, UIMenuController,
81+
UIMenuElement, UIMenuSystem, UINavigationController, UIPanGestureRecognizer, UIPasteConfiguration, UIPasteboard,
82+
UIPercentDrivenInteractiveTransition, UIPeripheralHost, UIPickerContentView, UIPickerView, UIPinchGestureRecognizer,
83+
UIPointerInteraction, UIPointerRegion, UIPointerRegionRequest, UIPointerShape, UIPointerStyle, UIPopoverController,
84+
UIPopoverPresentationController, UIPress, UIPreviewAction, UIPreviewItemController, UIPreviewParameters, UIPreviewTarget,
85+
UIRefreshControl, UIResponder, UISceneConfiguration, UIScreen, UIScribbleInteraction, UIScrollEdgeEffectStyle,
86+
UIScrollEvent, UIScrollView, UISheetPresentationController, UISheetPresentationControllerDetent, UIStackView,
87+
UIStoryboard, UISwipeGestureRecognizer, UITableView, UITableViewCell, UITableViewController, UITapGestureRecognizer,
88+
UITargetedDragPreview, UITargetedPreview, UITextAutofillSuggestion, UITextChecker, UITextCursorDropPositionAnimator,
89+
UITextEffectsWindow, UITextField, UITextInputAssistantItem, UITextInputTraits, UITextPlaceholder, UITextPosition,
90+
UITextRange, UITextSearchOptions, UITextSearchingFindSession, UITextSelectionDisplayInteraction, UITextSelectionRect,
91+
UITextSelectionRectCustomHandleInfo, UITextSuggestion, UITextView, UIToolbar, UIToolbarAppearance, UITouch,
92+
UITraitCollection, UITraitHDRHeadroomUsageLimit, UIView, UIViewController, UIVisualEffectView, UIWKAutocorrectionContext,
93+
UIWKAutocorrectionRects, UIWKDocumentContext, UIWKDocumentRequest, UIWKTextInteractionAssistant, UIWebBrowserView,
94+
UIWebClip, UIWebScrollView, UIWebView, UIWindow, UIWindowScene, UIWindowSceneGeometryPreferencesIOS, _TtC5UIKit21UITextEffectTextChunk,
95+
_UINavigationInteractiveTransitionBase, _UINavigationParallaxTransition, _UIParallaxTransitionPanGestureRecognizer,
96+
_UIRemoteView, _UITextDragCaretView, _UIViewControllerOneToOneTransitionContext, _UIWebHighlightLongPressGestureRecognizer]
97+
...
98+
--- !tapi-tbd
99+
tbd-version: 4
100+
targets: [arm64-ios, arm64e-ios]
101+
install-name: /System/Library/PrivateFrameworks/CollectionViewCore.framework/CollectionViewCore
102+
exports: []
103+
...
104+
--- !tapi-tbd
105+
tbd-version: 4
106+
targets: [arm64-ios, arm64e-ios]
107+
install-name: /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
108+
current-version: 1014
109+
exports:
110+
- targets: [arm64-ios, arm64e-ios]
111+
symbols: [_NSAdaptiveImageGlyphAttributeName, _NSAttachmentAttributeName, _NSBackgroundColorAttributeName, _NSBaseURLDocumentOption,
112+
_NSCharacterEncodingDocumentOption, _NSDocumentTypeDocumentAttribute, _NSDocumentTypeDocumentOption, _NSFontAttributeName,
113+
_NSForegroundColorAttributeName, _NSHTMLTextDocumentType, _NSLinkAttributeName, _NSParagraphStyleAttributeName,
114+
_NSRTFDTextDocumentType, _NSRTFTextDocumentType, _NSTextEncodingNameDocumentOption, _NSTextListMarkerCircle,
115+
_NSTextListMarkerDecimal, _NSTextListMarkerDisc, _NSTextListMarkerLowercaseRoman, _NSTextSizeMultiplierDocumentOption,
116+
_NSTimeoutDocumentOption, _NSUnderlineColorAttributeName, _NSUnderlineStyleAttributeName, _NSWebPreferencesDocumentOption,
117+
_NSWebResourceLoadDelegateDocumentOption, _UIFontDescriptorFamilyAttribute, _UIFontDescriptorTextStyleAttribute,
118+
_UIFontDescriptorTraitsAttribute, _UIFontWeightSemibold, _UIFontWeightTrait]
119+
objc-classes: [NSAdaptiveImageGlyph, NSParagraphStyle, NSShadow, NSTextAlternatives, NSTextAttachment, NSTextList,
120+
UIFont, UIFontDescriptor]
121+
reexports:
122+
- targets: [arm64-ios, arm64e-ios]
123+
objc-classes: [NSEmojiImageAsset, NSEmojiImageStrike]
124+
...
125+
--- !tapi-tbd
126+
tbd-version: 4
127+
targets: [arm64-ios, arm64e-ios]
128+
install-name: /System/Library/SubFrameworks/UIUtilities.framework/UIUtilities
129+
current-version: 9088.1.103
130+
exports: []
131+
...

0 commit comments

Comments
 (0)