Diff
Modified: trunk/Source/WTF/ChangeLog (247116 => 247117)
--- trunk/Source/WTF/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WTF/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,12 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * wtf/spi/cocoa/SecuritySPI.h: Declare SecTrustedApplicationCreateFromPath(...).
+
2019-07-03 Keith Miller <keith_mil...@apple.com>
PACCage should first cage leaving PAC bits intact then authenticate
Modified: trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h (247116 => 247117)
--- trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WTF/wtf/spi/cocoa/SecuritySPI.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -57,6 +57,10 @@
WTF_EXTERN_C_BEGIN
+#if PLATFORM(MAC)
+OSStatus SecTrustedApplicationCreateFromPath(const char* path, SecTrustedApplicationRef*);
+#endif
+
SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
WTF_EXTERN_C_END
Modified: trunk/Source/WebCore/ChangeLog (247116 => 247117)
--- trunk/Source/WebCore/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,16 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ No new tests, Catalina test expectations will be migrated in the near future.
+
+ * WebCorePrefix.h: Exclude the header which declares SecTrustedApplicationCreateFromPath unavailable on Mac.
+ * crypto/mac/SerializedCryptoKeyWrapMac.mm: Ensure that we define SecTrustedApplicationCreateFromPath
+ before other headers declare it unavailable on Mac.
+
2019-07-02 Myles C. Maxfield <mmaxfi...@apple.com>
[WHLSL] Standard library is too big to directly include in WebCore
Modified: trunk/Source/WebCore/PAL/ChangeLog (247116 => 247117)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,15 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * pal/spi/cf/CFNetworkSPI.h: Add new NSURLSessionConfiguration SPI.
+ * pal/spi/mac/AVFoundationSPI.h: resourceConservationLevelWhilePaused should
+ be defined after AVPlayerResourceConservationLevel.
+ * pal/spi/mac/NSViewSPI.h: Add subviewsIvar.
+
2019-07-03 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r246616.
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (247116 => 247117)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -207,6 +207,12 @@
#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
@property NSURLSessionCompanionProxyPreference _companionProxyPreference;
#endif
+#if HAVE(APP_SSO)
+@property BOOL _preventsAppSSO;
+#endif
+#if HAVE(ALLOWS_SENSITIVE_LOGGING)
+@property BOOL _allowsSensitiveLogging;
+#endif
@end
@interface NSURLSessionTask ()
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (247116 => 247117)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -327,8 +327,6 @@
#if !USE(APPLE_INTERNAL_SDK) && HAVE(AVPLAYER_RESOURCE_CONSERVATION_LEVEL)
@interface AVPlayer (AVPlayerPrivate)
-@property (nonatomic) AVPlayerResourceConservationLevel resourceConservationLevelWhilePaused;
-
typedef NS_ENUM(NSInteger, AVPlayerResourceConservationLevel) {
AVPlayerResourceConservationLevelNone = 0,
AVPlayerResourceConservationLevelReduceReadAhead = 1,
@@ -335,5 +333,8 @@
AVPlayerResourceConservationLevelReuseActivePlayerResources = 2,
AVPlayerResourceConservationLevelRecycleBuffer = 3,
};
+
+@property (nonatomic) AVPlayerResourceConservationLevel resourceConservationLevelWhilePaused;
+
@end
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h (247116 => 247117)
--- trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -23,6 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#import <wtf/Platform.h>
+
#if USE(APPKIT)
#import <pal/spi/cocoa/QuartzCoreSPI.h>
@@ -33,4 +35,8 @@
@end
+@interface NSView (SubviewsIvar)
+@property (assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
+@end
+
#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/WebCorePrefix.h (247116 => 247117)
--- trunk/Source/WebCore/WebCorePrefix.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/WebCorePrefix.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -149,6 +149,11 @@
#endif
#if PLATFORM(MAC)
+#if !USE(APPLE_INTERNAL_SDK)
+/* SecTrustedApplication.h declares SecTrustedApplicationCreateFromPath(...) to
+ * be unavailable on macOS, so do not include that header. */
+#define _SECURITY_SECTRUSTEDAPPLICATION_H_
+#endif
#include <CoreServices/CoreServices.h>
#endif
Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (247116 => 247117)
--- trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2019-07-03 23:26:03 UTC (rev 247117)
@@ -32,6 +32,7 @@
#include "LocalizedStrings.h"
#include <CommonCrypto/CommonSymmetricKeywrap.h>
#include <crt_externs.h>
+#include <wtf/spi/cocoa/SecuritySPI.h>
#include <wtf/text/Base64.h>
#include <wtf/text/CString.h>
#include <wtf/CryptographicUtilities.h>
Modified: trunk/Source/WebKit/ChangeLog (247116 => 247117)
--- trunk/Source/WebKit/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKit/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,14 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h: AppSSO is SPI.
+ * WebKit2Prefix.h: SecTask.h declares SecTaskGetCodeSignStatus(...) unavailable
+ on Mac, exclude this header.
+
2019-07-03 Daniel Bates <daba...@apple.com>
REGRESSION (r246817): fast/events/ios/key-events-comprehensive/key-events-{control, control-shift}.html are failing
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h (247116 => 247117)
--- trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -27,7 +27,7 @@
#if HAVE(APP_SSO)
-#include <AppSSO/SOBase.h>
+#include <pal/spi/cocoa/AppSSOSPI.h>
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
#include <wtf/RetainPtr.h>
Modified: trunk/Source/WebKit/WebKit2Prefix.h (247116 => 247117)
--- trunk/Source/WebKit/WebKit2Prefix.h 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKit/WebKit2Prefix.h 2019-07-03 23:26:03 UTC (rev 247117)
@@ -38,6 +38,11 @@
#include <CoreGraphics/CoreGraphics.h>
#ifdef __OBJC__
+#if !USE(APPLE_INTERNAL_SDK)
+/* SecTask.h declares SecTaskGetCodeSignStatus(...) to
+ * be unavailable on macOS, so do not include that header. */
+#define _SECURITY_SECTASK_H_
+#endif
#import <Foundation/Foundation.h>
#if USE(APPKIT)
#import <Cocoa/Cocoa.h>
Modified: trunk/Source/WebKitLegacy/ChangeLog (247116 => 247117)
--- trunk/Source/WebKitLegacy/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKitLegacy/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,13 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * mac/WebView/WebHTMLView.mm: Move NSView declaration to SPI header.
+ * mac/WebView/WebView.mm: Use _subviewsIvar instead of _subviews.
+
2019-06-27 Fujii Hironori <hironori.fu...@sony.com>
[CMake] Bump cmake_minimum_required version to 3.10
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (247116 => 247117)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2019-07-03 23:26:03 UTC (rev 247117)
@@ -218,10 +218,6 @@
- (id)_newFirstResponderAfterResigning;
@end
-@interface NSView (SubviewsIvar)
-@property (nullable, assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
-@end
-
#if !HAVE(SUBVIEWS_IVAR_SPI)
@implementation NSView (SubviewsIvar)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (247116 => 247117)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2019-07-03 23:26:03 UTC (rev 247117)
@@ -231,6 +231,7 @@
#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
#import <pal/spi/mac/NSResponderSPI.h>
#import <pal/spi/mac/NSSpellCheckerSPI.h>
+#import <pal/spi/mac/NSViewSPI.h>
#import <pal/spi/mac/NSWindowSPI.h>
#import <wtf/Assertions.h>
#import <wtf/FileSystem.h>
@@ -5808,19 +5809,15 @@
- (void)encodeWithCoder:(NSCoder *)encoder
{
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
// Set asside the subviews before we archive. We don't want to archive any subviews.
// The subviews will always be created in _commonInitializationFrameName:groupName:.
- id originalSubviews = _subviews;
- _subviews = nil;
- ALLOW_DEPRECATED_DECLARATIONS_END
+ id originalSubviews = self._subviewsIvar;
+ self._subviewsIvar = nil;
[super encodeWithCoder:encoder];
- ALLOW_DEPRECATED_DECLARATIONS_BEGIN
// Restore the subviews we set aside.
- _subviews = originalSubviews;
- ALLOW_DEPRECATED_DECLARATIONS_END
+ self._subviewsIvar = originalSubviews;
BOOL useBackForwardList = _private->page && static_cast<BackForwardList&>(_private->page->backForward().client()).enabled();
if ([encoder allowsKeyedCoding]) {
Modified: trunk/Tools/ChangeLog (247116 => 247117)
--- trunk/Tools/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Tools/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,12 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Add Mac framework stubs.
+
2019-07-03 Sam Weinig <wei...@apple.com>
Adopt simple structured bindings in more places
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (247116 => 247117)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2019-07-03 23:26:03 UTC (rev 247117)
@@ -26,6 +26,10 @@
PRODUCT_NAME = TestWebKitAPI;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=mac*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(MAC_OS_X_VERSION_MAJOR);
+FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
WK_AUTHKIT_LDFLAGS = $(WK_AUTHKIT_LDFLAGS_$(WK_PLATFORM_NAME));
Modified: trunk/WebKitLibraries/ChangeLog (247116 => 247117)
--- trunk/WebKitLibraries/ChangeLog 2019-07-03 23:22:46 UTC (rev 247116)
+++ trunk/WebKitLibraries/ChangeLog 2019-07-03 23:26:03 UTC (rev 247117)
@@ -1,3 +1,15 @@
+2019-07-03 Jonathan Bedard <jbed...@apple.com>
+
+ [Catalina] Enable WebKit build
+ https://bugs.webkit.org/show_bug.cgi?id=199209
+
+ Reviewed by Darin Adler.
+
+ * WebKitPrivateFrameworkStubs/Mac: Added.
+ * WebKitPrivateFrameworkStubs/Mac/101500: Added.
+ * WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework: Added.
+ * WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd: Added.
+
2019-04-29 Basuke Suzuki <basuke.suz...@sony.com>
[Win] Add flag to enable version information stamping and disable by default.
Added: trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd (0 => 247117)
--- trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd (rev 0)
+++ trunk/WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd 2019-07-03 23:26:03 UTC (rev 247117)
@@ -0,0 +1,8 @@
+--- !tapi-tbd-v3
+archs: [ x86_64 ]
+install-name: '/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit'
+platform: zippered
+exports:
+ - archs: [ x86_64 ]
+ objc-classes: [ AKAuthorizationController ]
+...
