Diff
Modified: trunk/Source/WebKit/ChangeLog (260333 => 260334)
--- trunk/Source/WebKit/ChangeLog 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/ChangeLog 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,3 +1,73 @@
+2020-04-18 Darin Adler <[email protected]>
+
+ Update header postprocessing version cutoff to keep Apple internal builds working
+ https://bugs.webkit.org/show_bug.cgi?id=210708
+
+ Reviewed by Brady Eidson.
+
+ * 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.
+
2020-04-18 Brady Eidson <[email protected]>
Fix WebUserContentControllerProxy vs ContentWorld lifetime
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (260333 => 260334)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2020-04-19 04:41:59 UTC (rev 260334)
@@ -154,10 +154,10 @@
INSTALLHDRS_SCRIPT_PHASE = YES;
APPLY_RULES_IN_COPY_HEADERS = $(USE_NEW_BUILD_SYSTEM);
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1015));
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1015 = YES;
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_1013));
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_1300 = YES;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_MACOS_1016));
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_MACOS_BEFORE_1016 = YES;
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphone*] = $(WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED$(WK_IOS_14));
+WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_IOS_BEFORE_14 = YES;
WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)_$(WK_PLATFORM_NAME));
WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES_macosx = -Wl,-not_for_dyld_shared_cache;
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h (260333 => 260334)
--- trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WKFoundation.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -35,7 +35,7 @@
#ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
#define WK_API_AVAILABLE(...)
-#define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default"))) WK_API_AVAILABLE(__VA_ARGS__)
+#define WK_CLASS_AVAILABLE(...) __attribute__((visibility("default")))
#define WK_API_DEPRECATED(_message, ...) __attribute__((deprecated(_message)))
#define WK_API_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((deprecated("use " #_replacement)))
#define WK_CLASS_DEPRECATED_WITH_REPLACEMENT(_replacement, ...) __attribute__((visibility("default"))) __attribute__((deprecated("use " #_replacement)))
Modified: trunk/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h (260333 => 260334)
--- trunk/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/Shared/API/Cocoa/_WKFrameHandle.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
@interface _WKFrameHandle : NSObject <NSCopying, NSSecureCoding>
Modified: trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.h (260333 => 260334)
--- trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/Shared/API/Cocoa/_WKRemoteObjectInterface.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
WK_CLASS_AVAILABLE(macos(10.10), ios(8.0))
@interface _WKRemoteObjectInterface : NSObject
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -27,7 +27,7 @@
NS_ASSUME_NONNULL_BEGIN
-/*! @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.
+/*! @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.
@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,
as well as managing multiple different environments within your own application.
For example:
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2019 Apple Inc. All rights reserved.
+* Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindResult.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindResult.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKFindResult.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
-* Copyright (C) 2019 Apple Inc. All rights reserved.
+* Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKFrameInfoPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKHTTPCookieStorePrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -26,7 +26,5 @@
#import <WebKit/WKHTTPCookieStore.h>
@interface WKHTTPCookieStore (WKPrivate)
-
- (void)_getCookiesForURL:(NSURL *)url completionHandler:(void (^)(NSArray<NSHTTPCookie *> *))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,9 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <WebKit/WKFrameInfo.h>
#import <WebKit/WKNavigationDelegate.h>
-
-#import <WebKit/WKFrameInfo.h>
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/_WKSameDocumentNavigationType.h>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPDFConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPDFConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPDFConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WKFoundation.h>
-
#import <CoreGraphics/CGGeometry.h>
#import <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
NS_ASSUME_NONNULL_BEGIN
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WKFoundation.h>
-
#import <CoreGraphics/CoreGraphics.h>
#import <Foundation/Foundation.h>
+#import <WebKit/WKFoundation.h>
/*! A WKPreferences object encapsulates the preference settings for a web
view. The preferences object associated with a web view is specified by
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,13 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
-
-#include <WebKit/WKPreferencesRefPrivate.h>
-
-#ifdef __OBJC__
-
#import <WebKit/WKPreferences.h>
+#import <WebKit/WKPreferencesRefPrivate.h>
typedef NS_ENUM(NSInteger, _WKStorageBlockingPolicy) {
_WKStorageBlockingPolicyAllowAll,
@@ -215,5 +210,3 @@
#endif
@end
-
-#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
@class _WKAutomationSession;
@class _WKDownload;
@class _WKProcessPoolConfiguration;
+
@protocol _WKAutomationDelegate;
@protocol _WKDownloadDelegate;
@protocol _WKGeolocationCoreLocationProvider;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WKUIDelegate.h>
-
#import <WebKit/WKDragDestinationAction.h>
#import <WebKit/WKSecurityOrigin.h>
+#import <WebKit/WKUIDelegate.h>
#import <WebKit/WKWebViewPrivate.h>
#import <WebKit/_WKActivatedElementInfo.h>
#import <WebKit/_WKWebAuthenticationPanel.h>
@@ -41,14 +40,18 @@
@class _WKFrameHandle;
#if TARGET_OS_IOS
+
@class UIContextMenuConfiguration;
@class UIDragItem;
@class UITargetedDragPreview;
@class WKContextMenuElementInfo;
+
@protocol UIContextMenuInteractionCommitAnimating;
@protocol UIDragSession;
@protocol UIDropSession;
+
#else
+
typedef NS_ENUM(NSInteger, _WKResourceLimit) {
_WKResourceLimitMemory,
_WKResourceLimitCPU,
@@ -59,6 +62,7 @@
_WKPlugInUnavailabilityReasonPluginCrashed,
_WKPlugInUnavailabilityReasonInsecurePluginVersion
} WK_API_AVAILABLE(macos(10.13.4));
+
#endif
typedef NS_ENUM(NSInteger, _WKAutoplayEvent) {
@@ -143,6 +147,7 @@
- (void)_webView:(WKWebView *)webView handleAutoplayEvent:(_WKAutoplayEvent)event withFlags:(_WKAutoplayEventFlags)flags WK_API_AVAILABLE(macos(10.13.4), ios(WK_IOS_TBA));
#if TARGET_OS_IPHONE
+
- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_API_AVAILABLE(ios(9.0));
- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;
- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKURLSchemeTaskPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScriptPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <WebKit/WKFoundation.h>
-
#import <Foundation/Foundation.h>
#import <WebKit/WKDataDetectorTypes.h>
+#import <WebKit/WKFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@@ -35,6 +34,7 @@
@class WKUserContentController;
@class WKWebpagePreferences;
@class WKWebsiteDataStore;
+
@protocol WKURLSchemeHandler;
#if TARGET_OS_IPHONE
@@ -204,14 +204,16 @@
@end
+#if TARGET_OS_IPHONE
+
@interface WKWebViewConfiguration (WKDeprecated)
-#if TARGET_OS_IPHONE
@property (nonatomic) BOOL mediaPlaybackRequiresUserAction WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(8.0, 9.0));
@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay WK_API_DEPRECATED_WITH_REPLACEMENT("allowsAirPlayForMediaPlayback", ios(8.0, 9.0));
@property (nonatomic) BOOL requiresUserActionForMediaPlayback WK_API_DEPRECATED_WITH_REPLACEMENT("mediaTypesRequiringUserActionForPlayback", ios(9.0, 10.0));
-#endif
@end
+#endif
+
NS_ASSUME_NONNULL_END
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <WebKit/WKBase.h>
#import <WebKit/WKWebViewConfiguration.h>
-#import <WebKit/WKBase.h>
-
#if TARGET_OS_IPHONE
typedef NS_ENUM(NSUInteger, _WKDragLiftDelay) {
_WKDragLiftDelayShort = 0,
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,9 +23,8 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <WebKit/WKDataDetectorTypes.h>
#import <WebKit/WKWebView.h>
-
-#import <WebKit/WKDataDetectorTypes.h>
#import <WebKit/_WKActivatedElementInfo.h>
#import <WebKit/_WKAttachment.h>
#import <WebKit/_WKFindOptions.h>
@@ -565,5 +564,3 @@
@end
#endif // !TARGET_OS_IPHONE
-
-
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
/*! @enum WKContentMode
@abstract A content mode represents the type of content to load, as well as
additional layout and rendering adaptations that are applied as a result of
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
-
#import <WebKit/WKFoundation.h>
#import <WebKit/WKWebpagePreferences.h>
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -37,7 +37,6 @@
WK_EXTERN NSString * const _WKWebsiteDataTypeAdClickAttributions WK_API_AVAILABLE(macos(10.15), ios(13.0));
WK_EXTERN NSString * const _WKWebsiteDataTypeAlternativeServices WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
-
#if !TARGET_OS_IPHONE
WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_API_AVAILABLE(macos(10.11));
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,14 +23,14 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKWebViewConfigurationPrivate.h"
+#import <WebKit/WKWebViewConfigurationPrivate.h>
#import <WebKit/WKWebsiteDataStore.h>
NS_ASSUME_NONNULL_BEGIN
-@class _WKWebsiteDataStoreConfiguration;
@class WKWebView;
@class _WKResourceLoadStatisticsThirdParty;
+@class _WKWebsiteDataStoreConfiguration;
@protocol _WKWebsiteDataStoreDelegate;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKDownload.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKDownload.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKDownload.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
@class WKFrameInfo;
@class WKWebView;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKFrameTreeNode.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKFrameTreeNode.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKFrameTreeNode.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Foundation/Foundation.h>
-#import <WebKit/WKFoundation.h>
#import <WebKit/WKFrameInfo.h>
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInputDelegate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInputDelegate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInputDelegate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,12 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
@class UITextSuggestion;
@class WKWebView;
+
@protocol _WKFocusedElementInfo;
@protocol _WKFormInputSession;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKInspectorDebuggableInfo.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKRemoteWebInspectorViewController.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,6 +28,7 @@
#if !TARGET_OS_IPHONE
@class WKWebView;
+
@protocol _WKRemoteWebInspectorViewControllerDelegate;
NS_ASSUME_NONNULL_BEGIN
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadDelegate.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadDelegate.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadDelegate.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -32,8 +32,8 @@
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
@protocol _WKResourceLoadDelegate <NSObject>
+
@optional
-
- (void)webView:(WKWebView *)webView resourceLoad:(_WKResourceLoadInfo *)resourceLoad didSendRequest:(NSURLRequest *)request;
- (void)webView:(WKWebView *)webView resourceLoad:(_WKResourceLoadInfo *)resourceLoad didPerformHTTPRedirection:(NSURLResponse *)response newRequest:(NSURLRequest *)request;
- (void)webView:(WKWebView *)webView resourceLoad:(_WKResourceLoadInfo *)resourceLoad didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadInfo.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadInfo.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadInfo.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -25,10 +25,10 @@
#import <WebKit/WKFoundation.h>
+NS_ASSUME_NONNULL_BEGIN
+
@class _WKFrameHandle;
-NS_ASSUME_NONNULL_BEGIN
-
typedef NS_ENUM(NSInteger, _WKResourceLoadInfoResourceType) {
_WKResourceLoadInfoResourceTypeApplicationManifest,
_WKResourceLoadInfoResourceTypeBeacon,
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
@class _WKTextManipulationExclusionRule;
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationExclusionRule.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
@interface _WKTextManipulationExclusionRule : NSObject
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationItem.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationItem.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationItem.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
@class _WKTextManipulationToken;
NS_ASSUME_NONNULL_BEGIN
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationToken.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationToken.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKTextManipulationToken.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
NS_ASSUME_NONNULL_BEGIN
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
NS_ASSUME_NONNULL_BEGIN
@class _WKUserContentWorld;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationAssertionResponse.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -23,12 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
-
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
NS_ASSUME_NONNULL_BEGIN
WK_CLASS_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA))
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2019-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,12 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
-
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
NS_ASSUME_NONNULL_BEGIN
@class LAContext;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <Foundation/Foundation.h>
#import <WebKit/WKFoundation.h>
-#import <Foundation/Foundation.h>
-
NS_ASSUME_NONNULL_BEGIN
WK_CLASS_AVAILABLE(macos(10.13), ios(11.0))
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h (260333 => 260334)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebsitePolicies.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (260333 => 260334)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-19 04:41:59 UTC (rev 260334)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 52;
objects = {
/* Begin PBXAggregateTarget section */
@@ -1857,6 +1857,8 @@
filePatterns = "*.h";
fileType = pattern.proxy;
inputFiles = (
+ "$(SRCROOT)/Configurations/WebKit.xcconfig",
+ "$(SRCROOT)/Scripts/postprocess-header-rule",
);
isEditable = 1;
outputFiles = (
Modified: trunk/Tools/ChangeLog (260333 => 260334)
--- trunk/Tools/ChangeLog 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/ChangeLog 2020-04-19 04:41:59 UTC (rev 260334)
@@ -1,3 +1,24 @@
+2020-04-18 Darin Adler <[email protected]>
+
+ Update header postprocessing version cutoff to keep Apple internal builds working
+ https://bugs.webkit.org/show_bug.cgi?id=210708
+
+ Reviewed by Brady Eidson.
+
+ * 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.
+
2020-04-18 Brady Eidson <[email protected]>
Fix WebUserContentControllerProxy vs ContentWorld lifetime
Modified: trunk/Tools/DumpRenderTree/ios/TextInputControllerIOS.m (260333 => 260334)
--- trunk/Tools/DumpRenderTree/ios/TextInputControllerIOS.m 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/ios/TextInputControllerIOS.m 2020-04-19 04:41:59 UTC (rev 260334)
@@ -32,7 +32,6 @@
// here to bring it up to parity with the Mac version (see TextInputControllerMac.m), and then reenable skipped iOS tests that use TextInputController.
#import <WebKit/WebFramePrivate.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebKitLegacy.h>
@implementation TextInputController
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -36,7 +36,6 @@
#import "DumpRenderTreeFileDraggingSource.h"
#import "DumpRenderTreePasteboard.h"
#import "EventSendingController.h"
-#import <WebKit/WebKit.h>
#import <wtf/RetainPtr.h>
@interface DumpRenderTreeFilePromiseReceiver : NSFilePromiseReceiver {
Modified: trunk/Tools/DumpRenderTree/mac/EditingDelegate.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/EditingDelegate.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/EditingDelegate.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -31,7 +31,6 @@
#import "DumpRenderTree.h"
#import "TestRunner.h"
-#import <WebKit/WebKit.h>
#import <WebKit/WebKitLegacy.h>
@interface DOMNode (dumpPath)
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.h (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.h 2020-04-19 04:41:59 UTC (rev 260334)
@@ -27,7 +27,6 @@
*/
#import <Foundation/Foundation.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebKitLegacy.h>
@interface EventSendingController : NSObject <DOMEventListener>
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -39,7 +39,6 @@
#import "DumpRenderTreePasteboard.h"
#import "WebCoreTestSupport.h"
#import <WebKit/DOMPrivate.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebViewPrivate.h>
#import <functional>
#import <wtf/RetainPtr.h>
Modified: trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -46,7 +46,6 @@
#import <_javascript_Core/_javascript_Core.h>
#import <WebKit/WebFramePrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebNSURLExtras.h>
#import <WebKit/WebScriptWorld.h>
#import <WebKit/WebSecurityOriginPrivate.h>
Modified: trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/ObjCPlugin.m 2020-04-19 04:41:59 UTC (rev 260334)
@@ -28,7 +28,6 @@
#import "ObjCPlugin.h"
#import <objc/runtime.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebKitLegacy.h>
// === NSObject category to expose almost everything to _javascript_ ===
Modified: trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -44,7 +44,6 @@
#import <WebKit/WebCoreStatistics.h>
#import <WebKit/WebDocumentPrivate.h>
#import <WebKit/WebHTMLViewPrivate.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebViewPrivate.h>
@interface WebView ()
Modified: trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/ResourceLoadDelegate.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -32,7 +32,6 @@
#import "DumpRenderTree.h"
#import "TestRunner.h"
#import <WebKit/WebDataSourcePrivate.h>
-#import <WebKit/WebKit.h>
#import <WebKit/WebKitLegacy.h>
#import <wtf/Assertions.h>
Modified: trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm (260333 => 260334)
--- trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2020-04-19 03:43:47 UTC (rev 260333)
+++ trunk/Tools/DumpRenderTree/mac/UIScriptControllerMac.mm 2020-04-19 04:41:59 UTC (rev 260334)
@@ -32,7 +32,7 @@
#import <_javascript_Core/JSStringRefCF.h>
#import <_javascript_Core/JSValue.h>
#import <_javascript_Core/OpaqueJSString.h>
-#import <WebKit/WebKit.h>
+#import <WebKit/WebPreferences.h>
#import <WebKit/WebViewPrivate.h>
#import <wtf/BlockPtr.h>
