| Differences between
and this patch
- Source/WTF/ChangeLog +10 lines
Lines 1-3 Source/WTF/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * wtf/spi/cocoa/SecuritySPI.h: Ensure that we define SecTrustedApplicationCreateFromPath before
9
        other headers declare it unavailable on Mac.
10
1
2019-07-02  Commit Queue  <commit-queue@webkit.org>
11
2019-07-02  Commit Queue  <commit-queue@webkit.org>
2
12
3
        Unreviewed, rolling out r247041.
13
        Unreviewed, rolling out r247041.
- Source/WTF/wtf/spi/cocoa/SecuritySPI.h +4 lines
Lines 57-62 enum { Source/WTF/wtf/spi/cocoa/SecuritySPI.h_sec1
57
57
58
WTF_EXTERN_C_BEGIN
58
WTF_EXTERN_C_BEGIN
59
59
60
#if PLATFORM(MAC)
61
OSStatus SecTrustedApplicationCreateFromPath(const char* path, SecTrustedApplicationRef*);
62
#endif
63
60
SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
64
SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
61
65
62
WTF_EXTERN_C_END
66
WTF_EXTERN_C_END
- Source/WebCore/ChangeLog +13 lines
Lines 1-3 Source/WebCore/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        No new tests, Catalina test expectations will be migrated in the near future.
9
10
        * WebCorePrefix.h: Exclude the header which declares SecTrustedApplicationCreateFromPath unavailable on Mac.
11
        * crypto/mac/SerializedCryptoKeyWrapMac.mm: Ensure that we define SecTrustedApplicationCreateFromPath
12
        before other headers declare it unavailable on Mac.
13
1
2019-07-02  Simon Fraser  <simon.fraser@apple.com>
14
2019-07-02  Simon Fraser  <simon.fraser@apple.com>
2
15
3
        REGRESSION (r246723): ScrollingTreeOverflowScrollProxyNode::m_overflowScrollingNodeID is uninitialized sometimes
16
        REGRESSION (r246723): ScrollingTreeOverflowScrollProxyNode::m_overflowScrollingNodeID is uninitialized sometimes
- Source/WebCore/WebCorePrefix.h +5 lines
Lines 149-154 Source/WebCore/WebCorePrefix.h_sec1
149
#endif
149
#endif
150
150
151
#if PLATFORM(MAC)
151
#if PLATFORM(MAC)
152
#if !USE(APPLE_INTERNAL_SDK)
153
/* SecTrustedApplication.h declares SecTrustedApplicationCreateFromPath(...) to
154
 * be unavailable on macOS, so do not include that header. */
155
#define _SECURITY_SECTRUSTEDAPPLICATION_H_
156
#endif
152
#include <CoreServices/CoreServices.h>
157
#include <CoreServices/CoreServices.h>
153
#endif
158
#endif
154
159
- Source/WebCore/PAL/ChangeLog +12 lines
Lines 1-3 Source/WebCore/PAL/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * pal/spi/cf/CFNetworkSPI.h: Add new NSURLSessionConfiguration SPI.
9
        * pal/spi/mac/AVFoundationSPI.h: resourceConservationLevelWhilePaused should
10
        be defined after AVPlayerResourceConservationLevel.
11
        * pal/spi/mac/NSViewSPI.h: Add subviewsIvar.
12
1
2019-06-28  Brent Fulgham  <bfulgham@apple.com>
13
2019-06-28  Brent Fulgham  <bfulgham@apple.com>
2
14
3
        [FTW] Build WebCore
15
        [FTW] Build WebCore
- Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h +6 lines
Lines 207-212 typedef NS_ENUM(NSInteger, NSURLSessionC Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h_sec1
207
#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
207
#if PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED >= 60000
208
@property NSURLSessionCompanionProxyPreference _companionProxyPreference;
208
@property NSURLSessionCompanionProxyPreference _companionProxyPreference;
209
#endif
209
#endif
210
#if HAVE(APP_SSO)
211
@property BOOL _preventsAppSSO;
212
#endif
213
#if HAVE(ALLOWS_SENSITIVE_LOGGING)
214
@property BOOL _allowsSensitiveLogging;
215
#endif
210
@end
216
@end
211
217
212
@interface NSURLSessionTask ()
218
@interface NSURLSessionTask ()
- Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h -2 / +3 lines
Lines 327-339 NS_ASSUME_NONNULL_END Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h_sec1
327
#if !USE(APPLE_INTERNAL_SDK) && HAVE(AVPLAYER_RESOURCE_CONSERVATION_LEVEL)
327
#if !USE(APPLE_INTERNAL_SDK) && HAVE(AVPLAYER_RESOURCE_CONSERVATION_LEVEL)
328
@interface AVPlayer (AVPlayerPrivate)
328
@interface AVPlayer (AVPlayerPrivate)
329
329
330
@property (nonatomic) AVPlayerResourceConservationLevel resourceConservationLevelWhilePaused;
331
332
typedef NS_ENUM(NSInteger, AVPlayerResourceConservationLevel) {
330
typedef NS_ENUM(NSInteger, AVPlayerResourceConservationLevel) {
333
    AVPlayerResourceConservationLevelNone                                 = 0,
331
    AVPlayerResourceConservationLevelNone                                 = 0,
334
    AVPlayerResourceConservationLevelReduceReadAhead                      = 1,
332
    AVPlayerResourceConservationLevelReduceReadAhead                      = 1,
335
    AVPlayerResourceConservationLevelReuseActivePlayerResources           = 2,
333
    AVPlayerResourceConservationLevelReuseActivePlayerResources           = 2,
336
    AVPlayerResourceConservationLevelRecycleBuffer                        = 3,
334
    AVPlayerResourceConservationLevelRecycleBuffer                        = 3,
337
};
335
};
336
337
@property (nonatomic) AVPlayerResourceConservationLevel resourceConservationLevelWhilePaused;
338
338
@end
339
@end
339
#endif
340
#endif
- Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h +6 lines
Lines 23-28 Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h_sec1
23
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24
 */
24
 */
25
25
26
#import <wtf/Platform.h>
27
26
#if USE(APPKIT)
28
#if USE(APPKIT)
27
29
28
#import <pal/spi/cocoa/QuartzCoreSPI.h>
30
#import <pal/spi/cocoa/QuartzCoreSPI.h>
Lines 33-36 @interface NSView () <CALayerDelegate> Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h_sec2
33
35
34
@end
36
@end
35
37
38
@interface NSView (SubviewsIvar)
39
@property (assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
40
@end
41
36
#endif // PLATFORM(MAC)
42
#endif // PLATFORM(MAC)
- Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm +1 lines
Lines 32-37 Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm_sec1
32
#include "LocalizedStrings.h"
32
#include "LocalizedStrings.h"
33
#include <CommonCrypto/CommonSymmetricKeywrap.h>
33
#include <CommonCrypto/CommonSymmetricKeywrap.h>
34
#include <crt_externs.h>
34
#include <crt_externs.h>
35
#include <wtf/spi/cocoa/SecuritySPI.h>
35
#include <wtf/text/Base64.h>
36
#include <wtf/text/Base64.h>
36
#include <wtf/text/CString.h>
37
#include <wtf/text/CString.h>
37
#include <wtf/CryptographicUtilities.h>
38
#include <wtf/CryptographicUtilities.h>
- Source/WebKit/ChangeLog +11 lines
Lines 1-3 Source/WebKit/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h: AppSSO is SPI.
9
        * WebKit2Prefix.h: Some Foundation headers declares some functions unavailable
10
        on Mac that are actually SPI, exclude this header.
11
1
2019-07-02  Joonghun Park  <jh718.park@samsung.com>
12
2019-07-02  Joonghun Park  <jh718.park@samsung.com>
2
13
3
        Unreviewed. Fix build break introduced in r247058.
14
        Unreviewed. Fix build break introduced in r247058.
- Source/WebKit/WebKit2Prefix.h +5 lines
Lines 38-43 Source/WebKit/WebKit2Prefix.h_sec1
38
#include <CoreGraphics/CoreGraphics.h>
38
#include <CoreGraphics/CoreGraphics.h>
39
39
40
#ifdef __OBJC__
40
#ifdef __OBJC__
41
#if !USE(APPLE_INTERNAL_SDK)
42
/* SecTask.h declares SecTaskGetCodeSignStatus(...) to
43
 * be unavailable on macOS, so do not include that header. */
44
#define _SECURITY_SECTASK_H_
45
#endif
41
#import <Foundation/Foundation.h>
46
#import <Foundation/Foundation.h>
42
#if USE(APPKIT)
47
#if USE(APPKIT)
43
#import <Cocoa/Cocoa.h>
48
#import <Cocoa/Cocoa.h>
- Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h -1 / +1 lines
Lines 27-33 Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h_sec1
27
27
28
#if HAVE(APP_SSO)
28
#if HAVE(APP_SSO)
29
29
30
#include <AppSSO/SOBase.h>
30
#include <pal/spi/cocoa/AppSSOSPI.h>
31
#include <wtf/Forward.h>
31
#include <wtf/Forward.h>
32
#include <wtf/RefCounted.h>
32
#include <wtf/RefCounted.h>
33
#include <wtf/RetainPtr.h>
33
#include <wtf/RetainPtr.h>
- Source/WebKitLegacy/ChangeLog +10 lines
Lines 1-3 Source/WebKitLegacy/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * mac/WebView/WebHTMLView.mm: Move NSView to SPI header.
9
        * mac/WebView/WebView.mm: Use _subviewsIvar instead of _subviews.
10
1
2019-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
11
2019-06-27  Fujii Hironori  <Hironori.Fujii@sony.com>
2
12
3
        [CMake] Bump cmake_minimum_required version to 3.10
13
        [CMake] Bump cmake_minimum_required version to 3.10
- Source/WebKitLegacy/mac/WebView/WebHTMLView.mm -4 lines
Lines 218-227 @interface NSWindow () Source/WebKitLegacy/mac/WebView/WebHTMLView.mm_sec1
218
- (id)_newFirstResponderAfterResigning;
218
- (id)_newFirstResponderAfterResigning;
219
@end
219
@end
220
220
221
@interface NSView (SubviewsIvar)
222
@property (nullable, assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
223
@end
224
225
#if !HAVE(SUBVIEWS_IVAR_SPI)
221
#if !HAVE(SUBVIEWS_IVAR_SPI)
226
@implementation NSView (SubviewsIvar)
222
@implementation NSView (SubviewsIvar)
227
223
- Source/WebKitLegacy/mac/WebView/WebView.mm -7 / +4 lines
Lines 231-236 Source/WebKitLegacy/mac/WebView/WebView.mm_sec1
231
#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
231
#import <pal/spi/cocoa/NSURLFileTypeMappingsSPI.h>
232
#import <pal/spi/mac/NSResponderSPI.h>
232
#import <pal/spi/mac/NSResponderSPI.h>
233
#import <pal/spi/mac/NSSpellCheckerSPI.h>
233
#import <pal/spi/mac/NSSpellCheckerSPI.h>
234
#import <pal/spi/mac/NSViewSPI.h>
234
#import <pal/spi/mac/NSWindowSPI.h>
235
#import <pal/spi/mac/NSWindowSPI.h>
235
#import <wtf/Assertions.h>
236
#import <wtf/Assertions.h>
236
#import <wtf/FileSystem.h>
237
#import <wtf/FileSystem.h>
Lines 5808-5826 - (instancetype)initWithCoder:(NSCoder * Source/WebKitLegacy/mac/WebView/WebView.mm_sec2
5808
5809
5809
- (void)encodeWithCoder:(NSCoder *)encoder
5810
- (void)encodeWithCoder:(NSCoder *)encoder
5810
{
5811
{
5811
    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
5812
    // Set asside the subviews before we archive. We don't want to archive any subviews.
5812
    // Set asside the subviews before we archive. We don't want to archive any subviews.
5813
    // The subviews will always be created in _commonInitializationFrameName:groupName:.
5813
    // The subviews will always be created in _commonInitializationFrameName:groupName:.
5814
    id originalSubviews = _subviews;
5814
    id originalSubviews = self._subviewsIvar;
5815
    _subviews = nil;
5815
    self._subviewsIvar = nil;
5816
    ALLOW_DEPRECATED_DECLARATIONS_END
5817
5816
5818
    [super encodeWithCoder:encoder];
5817
    [super encodeWithCoder:encoder];
5819
5818
5820
    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
5821
    // Restore the subviews we set aside.
5819
    // Restore the subviews we set aside.
5822
    _subviews = originalSubviews;
5820
    self._subviewsIvar = originalSubviews;
5823
    ALLOW_DEPRECATED_DECLARATIONS_END
5824
5821
5825
    BOOL useBackForwardList = _private->page && static_cast<BackForwardList&>(_private->page->backForward().client()).enabled();
5822
    BOOL useBackForwardList = _private->page && static_cast<BackForwardList&>(_private->page->backForward().client()).enabled();
5826
    if ([encoder allowsKeyedCoding]) {
5823
    if ([encoder allowsKeyedCoding]) {
- Tools/ChangeLog +9 lines
Lines 1-3 Tools/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Add Mac framework stubs.
9
1
2019-07-03  Aakash Jain  <aakash_jain@apple.com>
10
2019-07-03  Aakash Jain  <aakash_jain@apple.com>
2
11
3
        Unreviewed follow-up fix to r247049, default the platform to '*' when platform property is not set.
12
        Unreviewed follow-up fix to r247049, default the platform to '*' when platform property is not set.
- Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig +4 lines
Lines 26-31 Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig_sec1
26
PRODUCT_NAME = TestWebKitAPI;
26
PRODUCT_NAME = TestWebKitAPI;
27
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
27
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
28
28
29
WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
30
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=mac*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(MAC_OS_X_VERSION_MAJOR);
31
FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
32
29
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
33
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
30
34
31
WK_AUTHKIT_LDFLAGS = $(WK_AUTHKIT_LDFLAGS_$(WK_PLATFORM_NAME));
35
WK_AUTHKIT_LDFLAGS = $(WK_AUTHKIT_LDFLAGS_$(WK_PLATFORM_NAME));
- WebKitLibraries/ChangeLog +12 lines
Lines 1-3 WebKitLibraries/ChangeLog_sec1
1
2019-07-03  Jonathan Bedard  <jbedard@apple.com>
2
3
        [Catalina] Enable WebKit build
4
        https://bugs.webkit.org/show_bug.cgi?id=199209
5
6
        Reviewed by NOBODY (OOPS!).
7
8
        * WebKitPrivateFrameworkStubs/Mac: Added.
9
        * WebKitPrivateFrameworkStubs/Mac/101500: Added.
10
        * WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework: Added.
11
        * WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd: Added.
12
1
2019-04-29  Basuke Suzuki  <Basuke.Suzuki@sony.com>
13
2019-04-29  Basuke Suzuki  <Basuke.Suzuki@sony.com>
2
14
3
        [Win] Add flag to enable version information stamping and disable by default.
15
        [Win] Add flag to enable version information stamping and disable by default.
- WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd +8 lines
Line 0 WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd_sec1
1
--- !tapi-tbd-v3
2
archs:           [ x86_64 ]
3
install-name:    '/System/Library/PrivateFrameworks/AuthKit.framework/AuthKit'
4
platform: zippered
5
exports:
6
  - archs:           [ x86_64 ]
7
    objc-classes:    [ AKAuthorizationController ]
8
...

Return to Bug 199209