Changeset 260334 in webkit


Ignore:
Timestamp:
Apr 18, 2020 9:41:59 PM (4 years ago)
Author:
Darin Adler
Message:

Update header postprocessing version cutoff to keep Apple internal builds working
​https://bugs.webkit.org/show_bug.cgi?id=210708

Reviewed by Brady Eidson.

Source/WebKit:

  • Configurations/WebKit.xcconfig: Update versions to make building with older

Apple internal SDKs continue to work.

  • Shared/API/Cocoa/WKFoundation.h:
  • Shared/API/Cocoa/_WKFrameHandle.h:
  • Shared/API/Cocoa/_WKRemoteObjectInterface.h:
  • UIProcess/API/Cocoa/WKContentWorld.h:
  • UIProcess/API/Cocoa/WKFindConfiguration.h:
  • UIProcess/API/Cocoa/WKFindResult.h:
  • UIProcess/API/Cocoa/WKFrameInfoPrivate.h:
  • UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h:
  • UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
  • UIProcess/API/Cocoa/WKPDFConfiguration.h:
  • UIProcess/API/Cocoa/WKPreferences.h:
  • UIProcess/API/Cocoa/WKPreferencesPrivate.h:
  • UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
  • UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
  • UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h:
  • UIProcess/API/Cocoa/WKUserScriptPrivate.h:
  • UIProcess/API/Cocoa/WKWebView.h:
  • UIProcess/API/Cocoa/WKWebViewConfiguration.h:
  • UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
  • UIProcess/API/Cocoa/WKWebViewPrivate.h:
  • UIProcess/API/Cocoa/WKWebpagePreferences.h:
  • UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h:
  • UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
  • UIProcess/API/Cocoa/_WKDownload.h:
  • UIProcess/API/Cocoa/_WKFrameTreeNode.h:
  • UIProcess/API/Cocoa/_WKInputDelegate.h:
  • UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h:
  • UIProcess/API/Cocoa/_WKResourceLoadDelegate.h:
  • UIProcess/API/Cocoa/_WKResourceLoadInfo.h:
  • UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h:
  • UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h:
  • UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h:
  • UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h:
  • UIProcess/API/Cocoa/_WKTextManipulationItem.h:
  • UIProcess/API/Cocoa/_WKTextManipulationToken.h:
  • UIProcess/API/Cocoa/_WKUserContentWorld.h:
  • UIProcess/API/Cocoa/_WKUserStyleSheet.h:
  • UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h:
  • UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h:
  • UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
  • UIProcess/API/Cocoa/_WKWebsitePolicies.h:

Because the way we do post-processing of headers in the legacy Xcode
build system won't work once the files have been processed once, touch
each file that has WK_MAC_TBA, WK_IOS_TBA, or
WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED in it. Found something to
change in each file. This is likely unnecessary in the new Xcode build
system, but I wasn't able to test that locally.

  • WebKit.xcodeproj/project.pbxproj:

(postprocess-header-rule): Added dependencies so that post-processing will be
redone if Configurations/WebKit.xcconfig is touched, since that is where
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED is set, or if
Scripts/postprocess-header-rule is touched, since that is where the
post-processing code is. If either of those files changes it could affect the
output of post-processing. This should make a change like this work in the
new Xcode build system without touching files as is done above.

Tools:

  • DumpRenderTree/ios/TextInputControllerIOS.m:
  • DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
  • DumpRenderTree/mac/EditingDelegate.mm:
  • DumpRenderTree/mac/EventSendingController.h:
  • DumpRenderTree/mac/EventSendingController.mm:
  • DumpRenderTree/mac/FrameLoadDelegate.mm:
  • DumpRenderTree/mac/ObjCPlugin.m:
  • DumpRenderTree/mac/PixelDumpSupportMac.mm:
  • DumpRenderTree/mac/ResourceLoadDelegate.mm:
  • DumpRenderTree/mac/UIScriptControllerMac.mm:

Removed includes of <WebKit/WebKit.h>, the header for modern WebKit, from the files
here that are intending to use WebKitLegacy. This is harmless, except for if someone
builds DumpRenderTree *before* building WebKit as I just did.

Location:
trunk
Files:
58 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r260330 r260334  
     12020-04-18  Darin Adler  <darin@apple.com>
     2
     3        Update header postprocessing version cutoff to keep Apple internal builds working
     4        https://bugs.webkit.org/show_bug.cgi?id=210708
     5
     6        Reviewed by Brady Eidson.
     7
     8        * Configurations/WebKit.xcconfig: Update versions to make building with older
     9        Apple internal SDKs continue to work.
     10
     11        * Shared/API/Cocoa/WKFoundation.h:
     12        * Shared/API/Cocoa/_WKFrameHandle.h:
     13        * Shared/API/Cocoa/_WKRemoteObjectInterface.h:
     14        * UIProcess/API/Cocoa/WKContentWorld.h:
     15        * UIProcess/API/Cocoa/WKFindConfiguration.h:
     16        * UIProcess/API/Cocoa/WKFindResult.h:
     17        * UIProcess/API/Cocoa/WKFrameInfoPrivate.h:
     18        * UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h:
     19        * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
     20        * UIProcess/API/Cocoa/WKPDFConfiguration.h:
     21        * UIProcess/API/Cocoa/WKPreferences.h:
     22        * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
     23        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     24        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
     25        * UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h:
     26        * UIProcess/API/Cocoa/WKUserScriptPrivate.h:
     27        * UIProcess/API/Cocoa/WKWebView.h:
     28        * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
     29        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
     30        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     31        * UIProcess/API/Cocoa/WKWebpagePreferences.h:
     32        * UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h:
     33        * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
     34        * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h:
     35        * UIProcess/API/Cocoa/_WKDownload.h:
     36        * UIProcess/API/Cocoa/_WKFrameTreeNode.h:
     37        * UIProcess/API/Cocoa/_WKInputDelegate.h:
     38        * UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h:
     39        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     40        * UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h:
     41        * UIProcess/API/Cocoa/_WKResourceLoadDelegate.h:
     42        * UIProcess/API/Cocoa/_WKResourceLoadInfo.h:
     43        * UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h:
     44        * UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h:
     45        * UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h:
     46        * UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h:
     47        * UIProcess/API/Cocoa/_WKTextManipulationItem.h:
     48        * UIProcess/API/Cocoa/_WKTextManipulationToken.h:
     49        * UIProcess/API/Cocoa/_WKUserContentWorld.h:
     50        * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
     51        * UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h:
     52        * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h:
     53        * UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h:
     54        * UIProcess/API/Cocoa/_WKWebsitePolicies.h:
     55        Because the way we do post-processing of headers in the legacy Xcode
     56        build system won't work once the files have been processed once, touch
     57        each file that has WK_MAC_TBA, WK_IOS_TBA, or
     58        WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED in it. Found something to
     59        change in each file. This is likely unnecessary in the new Xcode build
     60        system, but I wasn't able to test that locally.
     61
     62        * WebKit.xcodeproj/project.pbxproj:
     63        (postprocess-header-rule): Added dependencies so that post-processing will be
     64        redone if Configurations/WebKit.xcconfig is touched, since that is where
     65        WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED is set, or if
     66        Scripts/postprocess-header-rule is touched, since that is where the
     67        post-processing code is. If either of those files changes it could affect the
     68        output of post-processing. This should make a change like this work in the
     69        new Xcode build system without touching files as is done above.
     70
    1712020-04-18  Brady Eidson  <beidson@apple.com>
    272

  • trunk/Source/WebKit/Configurations/WebKit.xcconfig

    r259726 r260334  
    155155APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
    156156
    157 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015));
    158 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES;
    159 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_1013));
    160 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_1300 = YES;
     157WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1016));
     158WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1016 = YES;
     159WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_14));
     160WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_14 = YES;
    161161
    162162WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_PLATFORM_NAME));

  • trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h

    r254938 r260334  
    3636
    3737#define WK_API_AVAILABLE(...)
    38 #define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default"))) WK_API_AVAILABLE(__VA_ARGS__)
     38#define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default")))
    3939#define WK_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
    4040#define WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))

  • trunk/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h

    r254409 r260334  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))

  • trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.h

    r253781 r260334  
    11/*
    2  * Copyright (C) 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.h

    r257819 r260334  
    2828NS_ASSUME_NONNULL_BEGIN
    2929
    30 /*! @abstract A WKContentWorld object allows you to seperate your application's interaction with content displayed in a WKWebView into different roles that cannot interfere with one another.
     30/*! @abstract A WKContentWorld object allows you to separate your application's interaction with content displayed in a WKWebView into different roles that cannot interfere with one another.
    3131@discussion WKContentWorld objects should be treated as namespaces. This is useful for keeping your application's web content environment separate from the environment of the web page content itself,
    3232as well as managing multiple different environments within your own application.

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindConfiguration.h

    r252303 r260334  
    11/*
    2 * Copyright (C) 2019 Apple Inc. All rights reserved.
     2* Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33*
    44* Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindResult.h

    r252303 r260334  
    11/*
    2 * Copyright (C) 2019 Apple Inc. All rights reserved.
     2* Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33*
    44* Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h

    r257962 r260334  
    11/*
    2  * Copyright (C) 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h

    r256315 r260334  
    2727
    2828@interface WKHTTPCookieStore (WKPrivate)
    29 
    3029- (void)_getCookiesForURL:(NSURL *)url completionHandler:(void (^)(NSArray<NSHTTPCookie *> *))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    31 
    3230@end

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h

    r257963 r260334  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <WebKit/WKFrameInfo.h>
    2627#import <WebKit/WKNavigationDelegate.h>
    27 
    28 #import <WebKit/WKFrameInfo.h>
    2928#import <WebKit/WKWebViewPrivate.h>
    3029#import <WebKit/_WKSameDocumentNavigationType.h>

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPDFConfiguration.h

    r251553 r260334  
    2424 */
    2525
    26 #import <WebKit/WKFoundation.h>
    27 
    2826#import <CoreGraphics/CGGeometry.h>
    2927#import <Foundation/Foundation.h>
     28#import <WebKit/WKFoundation.h>
    3029
    3130NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h

    r256715 r260334  
    11/*
    2  * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import <WebKit/WKFoundation.h>
    27 
    2826#import <CoreGraphics/CoreGraphics.h>
    2927#import <Foundation/Foundation.h>
     28#import <WebKit/WKFoundation.h>
    3029
    3130/*! A WKPreferences object encapsulates the preference settings for a web

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h

    r260303 r260334  
    2424 */
    2525
    26 #pragma once
    27 
    28 #include <WebKit/WKPreferencesRefPrivate.h>
    29 
    30 #ifdef __OBJC__
    31 
    3226#import <WebKit/WKPreferences.h>
     27#import <WebKit/WKPreferencesRefPrivate.h>
    3328
    3429typedef NS_ENUM(NSInteger, _WKStorageBlockingPolicy) {
    … …  
    216211
    217212@end
    218 
    219 #endif

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

    r255496 r260334  
    11/*
    2  * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3232@class _WKDownload;
    3333@class _WKProcessPoolConfiguration;
     34
    3435@protocol _WKAutomationDelegate;
    3536@protocol _WKDownloadDelegate;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

    r259061 r260334  
    11/*
    2  * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import <WebKit/WKUIDelegate.h>
    27 
    2826#import <WebKit/WKDragDestinationAction.h>
    2927#import <WebKit/WKSecurityOrigin.h>
     28#import <WebKit/WKUIDelegate.h>
    3029#import <WebKit/WKWebViewPrivate.h>
    3130#import <WebKit/_WKActivatedElementInfo.h>
    … …  
    4241
    4342#if TARGET_OS_IOS
     43
    4444@class UIContextMenuConfiguration;
    4545@class UIDragItem;
    4646@class UITargetedDragPreview;
    4747@class WKContextMenuElementInfo;
     48
    4849@protocol UIContextMenuInteractionCommitAnimating;
    4950@protocol UIDragSession;
    5051@protocol UIDropSession;
     52
    5153#else
     54
    5255typedef NS_ENUM(NSInteger, _WKResourceLimit) {
    5356    _WKResourceLimitMemory,
    … …  
    6063    _WKPlugInUnavailabilityReasonInsecurePluginVersion
    6164} WK_API_AVAILABLE(macos(10.13.4));
     65
    6266#endif
    6367
    … …  
    144148
    145149#if TARGET_OS_IPHONE
     150
    146151- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9.0));
    147152- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h

    r254877 r260334  
    11/*
    2  * Copyright (C) 2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScriptPrivate.h

    r259523 r260334  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h

    r259005 r260334  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h

    r260228 r260334  
    2424 */
    2525
    26 #import <WebKit/WKFoundation.h>
    27 
    2826#import <Foundation/Foundation.h>
    2927#import <WebKit/WKDataDetectorTypes.h>
     28#import <WebKit/WKFoundation.h>
    3029
    3130NS_ASSUME_NONNULL_BEGIN
    … …  
    3635@class WKWebpagePreferences;
    3736@class WKWebsiteDataStore;
     37
    3838@protocol WKURLSchemeHandler;
    3939
    … …  
    205205@end
    206206
     207#if TARGET_OS_IPHONE
     208
    207209@interface WKWebViewConfiguration (WKDeprecated)
    208210
    209 #if TARGET_OS_IPHONE
    210211@property (nonatomic) BOOL mediaPlaybackRequiresUserAction WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(8.0, 9.0));
    211212@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay WK_API_DEPRECATED_WITH_REPLACEMENT("allowsAirPlayForMediaPlayback", ios(8.0, 9.0));
    212213@property (nonatomic) BOOL requiresUserActionForMediaPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(9.0, 10.0));
     214
     215@end
     216
    213217#endif
    214218
    215 @end
    216 
    217219NS_ASSUME_NONNULL_END

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r259523 r260334  
    2424 */
    2525
     26#import <WebKit/WKBase.h>
    2627#import <WebKit/WKWebViewConfiguration.h>
    27 
    28 #import <WebKit/WKBase.h>
    2928
    3029#if TARGET_OS_IPHONE

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r260303 r260334  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <WebKit/WKDataDetectorTypes.h>
    2627#import <WebKit/WKWebView.h>
    27 
    28 #import <WebKit/WKDataDetectorTypes.h>
    2928#import <WebKit/_WKActivatedElementInfo.h>
    3029#import <WebKit/_WKAttachment.h>
    … …  
    566565
    567566#endif // !TARGET_OS_IPHONE
    568 
    569 

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h

    r256715 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029/*! @enum WKContentMode

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h

    r259307 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2323 * THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    25 
    26 #pragma once
    2725
    2826#import <WebKit/WKFoundation.h>

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h

    r257785 r260334  
    11/*
    2  * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3838WK_EXTERN NSString * const _WKWebsiteDataTypeAlternativeServices WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    3939
    40 
    4140#if !TARGET_OS_IPHONE
    4241WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_API_AVAILABLE(macos(10.11));

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h

    r259350 r260334  
    11/*
    2  * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "WKWebViewConfigurationPrivate.h"
     26#import <WebKit/WKWebViewConfigurationPrivate.h>
    2727#import <WebKit/WKWebsiteDataStore.h>
    2828
    2929NS_ASSUME_NONNULL_BEGIN
    3030
    31 @class _WKWebsiteDataStoreConfiguration;
    3231@class WKWebView;
    3332@class _WKResourceLoadStatisticsThirdParty;
     33@class _WKWebsiteDataStoreConfiguration;
    3434
    3535@protocol _WKWebsiteDataStoreDelegate;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKDownload.h

    r255845 r260334  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029@class WKFrameInfo;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKFrameTreeNode.h

    r257872 r260334  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    27 #import <WebKit/WKFoundation.h>
    2826#import <WebKit/WKFrameInfo.h>
    2927

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInputDelegate.h

    r247804 r260334  
    11/*
    2  * Copyright (C) 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029@class UITextSuggestion;
    3130@class WKWebView;
     31
    3232@protocol _WKFocusedElementInfo;
    3333@protocol _WKFormInputSession;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h

    r253868 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r256845 r260334  
    11/*
    2  * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h

    r251227 r260334  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2929
    3030@class WKWebView;
     31
    3132@protocol _WKRemoteWebInspectorViewControllerDelegate;
    3233

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadDelegate.h

    r257818 r260334  
    3333WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
    3434@protocol _WKResourceLoadDelegate <NSObject>
     35
    3536@optional
    36 
    3737- (void)webView:(WKWebView *)webView resourceLoad:(_WKResourceLoadInfo *)resourceLoad didSendRequest:(NSURLRequest *)request;
    3838- (void)webView:(WKWebView *)webView resourceLoad:(_WKResourceLoadInfo *)resourceLoad didPerformHTTPRedirection:(NSURLResponse *)response newRequest:(NSURLRequest *)request;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadInfo.h

    r258017 r260334  
    2626#import <WebKit/WKFoundation.h>
    2727
     28NS_ASSUME_NONNULL_BEGIN
     29
    2830@class _WKFrameHandle;
    29 
    30 NS_ASSUME_NONNULL_BEGIN
    3131
    3232typedef NS_ENUM(NSInteger, _WKResourceLoadInfoResourceType) {

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h

    r254472 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h

    r254472 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h

    r251600 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029@class _WKTextManipulationExclusionRule;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h

    r253112 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationItem.h

    r257830 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029@class _WKTextManipulationToken;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationToken.h

    r253009 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h

    r256561 r260334  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h

    r260254 r260334  
    11/*
    2  * Copyright (C) 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h

    r254554 r260334  
    2424 */
    2525
    26 #pragma once
    27 
     26#import <Foundation/Foundation.h>
    2827#import <WebKit/WKFoundation.h>
    29 
    30 #import <Foundation/Foundation.h>
    3128
    3229NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h

    r257954 r260334  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #pragma once
    27 
     26#import <Foundation/Foundation.h>
    2827#import <WebKit/WKFoundation.h>
    29 
    30 #import <Foundation/Foundation.h>
    3128
    3229NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h

    r260169 r260334  
    11/*
    2  * Copyright (C) 2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
     26#import <Foundation/Foundation.h>
    2627#import <WebKit/WKFoundation.h>
    27 
    28 #import <Foundation/Foundation.h>
    2928
    3029NS_ASSUME_NONNULL_BEGIN

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h

    r254005 r260334  
    11/*
    2  * Copyright (C) 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r260191 r260334  
    44        classes = {
    55        };
    6         objectVersion = 51;
     6        objectVersion = 52;
    77        objects = {
    88
    … …  
    18581858                        fileType = pattern.proxy;
    18591859                        inputFiles = (
     1860                                "$(SRCROOT)/Configurations/WebKit.xcconfig",
     1861                                "$(SRCROOT)/Scripts/postprocess-header-rule",
    18601862                        );
    18611863                        isEditable = 1;

  • trunk/Tools/ChangeLog

    r260330 r260334  
     12020-04-18  Darin Adler  <darin@apple.com>
     2
     3        Update header postprocessing version cutoff to keep Apple internal builds working
     4        https://bugs.webkit.org/show_bug.cgi?id=210708
     5
     6        Reviewed by Brady Eidson.
     7
     8        * DumpRenderTree/ios/TextInputControllerIOS.m:
     9        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm:
     10        * DumpRenderTree/mac/EditingDelegate.mm:
     11        * DumpRenderTree/mac/EventSendingController.h:
     12        * DumpRenderTree/mac/EventSendingController.mm:
     13        * DumpRenderTree/mac/FrameLoadDelegate.mm:
     14        * DumpRenderTree/mac/ObjCPlugin.m:
     15        * DumpRenderTree/mac/PixelDumpSupportMac.mm:
     16        * DumpRenderTree/mac/ResourceLoadDelegate.mm:
     17        * DumpRenderTree/mac/UIScriptControllerMac.mm:
     18        Removed includes of <WebKit/WebKit.h>, the header for modern WebKit, from the files
     19        here that are intending to use WebKitLegacy. This is harmless, except for if someone
     20        builds DumpRenderTree *before* building WebKit as I just did.
     21
    1222020-04-18  Brady Eidson  <beidson@apple.com>
    223

  • trunk/Tools/DumpRenderTree/ios/TextInputControllerIOS.m

    r259843 r260334  
    3333
    3434#import <WebKit/WebFramePrivate.h>
    35 #import <WebKit/WebKit.h>
    3635#import <WebKit/WebKitLegacy.h>
    3736

  • trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm

    r246141 r260334  
    3737#import "DumpRenderTreePasteboard.h"
    3838#import "EventSendingController.h"
    39 #import <WebKit/WebKit.h>
    4039#import <wtf/RetainPtr.h>
    4140

  • trunk/Tools/DumpRenderTree/mac/EditingDelegate.mm

    r257161 r260334  
    3232#import "DumpRenderTree.h"
    3333#import "TestRunner.h"
    34 #import <WebKit/WebKit.h>
    3534#import <WebKit/WebKitLegacy.h>
    3635

  • trunk/Tools/DumpRenderTree/mac/EventSendingController.h

    r258679 r260334  
    2828
    2929#import <Foundation/Foundation.h>
    30 #import <WebKit/WebKit.h>
    3130#import <WebKit/WebKitLegacy.h>
    3231

  • trunk/Tools/DumpRenderTree/mac/EventSendingController.mm

    r259843 r260334  
    4040#import "WebCoreTestSupport.h"
    4141#import <WebKit/DOMPrivate.h>
    42 #import <WebKit/WebKit.h>
    4342#import <WebKit/WebViewPrivate.h>
    4443#import <functional>

  • trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm

    r237266 r260334  
    4747#import <WebKit/WebFramePrivate.h>
    4848#import <WebKit/WebHTMLViewPrivate.h>
    49 #import <WebKit/WebKit.h>
    5049#import <WebKit/WebNSURLExtras.h>
    5150#import <WebKit/WebScriptWorld.h>

  • trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m

    r257161 r260334  
    2929
    3030#import <objc/runtime.h>
    31 #import <WebKit/WebKit.h>
    3231#import <WebKit/WebKitLegacy.h>
    3332

  • trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm

    r254042 r260334  
    4545#import <WebKit/WebDocumentPrivate.h>
    4646#import <WebKit/WebHTMLViewPrivate.h>
    47 #import <WebKit/WebKit.h>
    4847#import <WebKit/WebViewPrivate.h>
    4948

  • trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm

    r257161 r260334  
    3333#import "TestRunner.h"
    3434#import <WebKit/WebDataSourcePrivate.h>
    35 #import <WebKit/WebKit.h>
    3635#import <WebKit/WebKitLegacy.h>
    3736#import <wtf/Assertions.h>

  • trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm

    r259843 r260334  
    3333#import <JavaScriptCore/JSValue.h>
    3434#import <JavaScriptCore/OpaqueJSString.h>
    35 #import <WebKit/WebKit.h>
     35#import <WebKit/WebPreferences.h>
    3636#import <WebKit/WebViewPrivate.h>
    3737#import <wtf/BlockPtr.h>
Note: See TracChangeset for help on using the changeset viewer.