Attachment 373425 Details for Bug 199209 – patch-for-landing

[patch] patch-for-landing

patch.patch (text/plain), 13.46 KB, created by Jonathan Bedard on 2019-07-03 15:42:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-07-03 15:42:02 PDT

Size: 13.46 KB

patch

obsolete

>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 247091)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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-02  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r247041.
>Index: Source/WTF/wtf/spi/cocoa/SecuritySPI.h
>===================================================================
>--- Source/WTF/wtf/spi/cocoa/SecuritySPI.h	(revision 247091)
>+++ Source/WTF/wtf/spi/cocoa/SecuritySPI.h	(working copy)
>@@ -57,6 +57,10 @@ enum {
> 
> WTF_EXTERN_C_BEGIN
> 
>+#if PLATFORM(MAC)
>+OSStatus SecTrustedApplicationCreateFromPath(const char* path, SecTrustedApplicationRef*);
>+#endif
>+
> SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
> 
> WTF_EXTERN_C_END
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 247091)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r246723): ScrollingTreeOverflowScrollProxyNode::m_overflowScrollingNodeID is uninitialized sometimes
>Index: Source/WebCore/WebCorePrefix.h
>===================================================================
>--- Source/WebCore/WebCorePrefix.h	(revision 247091)
>+++ Source/WebCore/WebCorePrefix.h	(working copy)
>@@ -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
> 
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 247091)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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-06-28  Brent Fulgham  <bfulgham@apple.com>
> 
>         [FTW] Build WebCore
>Index: Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	(revision 247091)
>+++ Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	(working copy)
>@@ -207,6 +207,12 @@ typedef NS_ENUM(NSInteger, NSURLSessionC
> #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 ()
>Index: Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h	(revision 247091)
>+++ Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h	(working copy)
>@@ -327,13 +327,14 @@ NS_ASSUME_NONNULL_END
> #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,
>     AVPlayerResourceConservationLevelReuseActivePlayerResources           = 2,
>     AVPlayerResourceConservationLevelRecycleBuffer                        = 3,
> };
>+
>+@property (nonatomic) AVPlayerResourceConservationLevel resourceConservationLevelWhilePaused;
>+
> @end
> #endif
>Index: Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h	(revision 247091)
>+++ Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h	(working copy)
>@@ -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 @@ @interface NSView () <CALayerDelegate>
> 
> @end
> 
>+@interface NSView (SubviewsIvar)
>+@property (assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
>+@end
>+
> #endif // PLATFORM(MAC)
>Index: Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm
>===================================================================
>--- Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm	(revision 247091)
>+++ Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm	(working copy)
>@@ -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>
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 247091)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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-02  Joonghun Park  <jh718.park@samsung.com>
> 
>         Unreviewed. Fix build break introduced in r247058.
>Index: Source/WebKit/WebKit2Prefix.h
>===================================================================
>--- Source/WebKit/WebKit2Prefix.h	(revision 247091)
>+++ Source/WebKit/WebKit2Prefix.h	(working copy)
>@@ -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>
>Index: Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h	(revision 247091)
>+++ Source/WebKit/UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h	(working copy)
>@@ -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>
>Index: Source/WebKitLegacy/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/ChangeLog	(revision 247091)
>+++ Source/WebKitLegacy/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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.Fujii@sony.com>
> 
>         [CMake] Bump cmake_minimum_required version to 3.10
>Index: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(revision 247091)
>+++ Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(working copy)
>@@ -218,10 +218,6 @@ @interface NSWindow ()
> - (id)_newFirstResponderAfterResigning;
> @end
> 
>-@interface NSView (SubviewsIvar)
>-@property (nullable, assign, setter=_setSubviewsIvar:) NSMutableArray<__kindof NSView *> *_subviewsIvar;
>-@end
>-
> #if !HAVE(SUBVIEWS_IVAR_SPI)
> @implementation NSView (SubviewsIvar)
> 
>Index: Source/WebKitLegacy/mac/WebView/WebView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebView.mm	(revision 247091)
>+++ Source/WebKitLegacy/mac/WebView/WebView.mm	(working copy)
>@@ -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 @@ - (instancetype)initWithCoder:(NSCoder *
> 
> - (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]) {
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 247091)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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  Aakash Jain  <aakash_jain@apple.com>
> 
>         Unreviewed follow-up fix to r247049, default the platform to '*' when platform property is not set.
>Index: Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	(revision 247091)
>+++ Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	(working copy)
>@@ -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));
>Index: WebKitLibraries/ChangeLog
>===================================================================
>--- WebKitLibraries/ChangeLog	(revision 247091)
>+++ WebKitLibraries/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-07-03  Jonathan Bedard  <jbedard@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.Suzuki@sony.com>
> 
>         [Win] Add flag to enable version information stamping and disable by default.
>Index: WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd
>===================================================================
>--- WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd	(nonexistent)
>+++ WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/101500/AuthKit.framework/AuthKit.tbd	(working copy)
>@@ -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 ]
>+...

Actions: View | Formatted Diff | Diff

Attachments on bug 199209: 372875 | 372876 | 372928 | 372930 | 372933 | 372970 | 373407 | 373418 | 373425