Attachment 372933 Details for Bug 199209 – patch-5

[patch] patch-5

patch.patch (text/plain), 12.05 KB, created by Jonathan Bedard on 2019-06-26 10:06:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-06-26 10:06:00 PDT

Size: 12.05 KB

patch

obsolete

>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 246738)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/spi/cocoa/SecuritySPI.h: Ensure that we define SecTrustedApplicationCreateFromPath before
>+        other headers declare it unavailable on Mac.
>+
> 2019-06-23  Simon Fraser  <simon.fraser@apple.com>
> 
>         Add OverflowScrollProxyNodes to the scrolling tree
>Index: Source/WTF/wtf/spi/cocoa/SecuritySPI.h
>===================================================================
>--- Source/WTF/wtf/spi/cocoa/SecuritySPI.h	(revision 246738)
>+++ Source/WTF/wtf/spi/cocoa/SecuritySPI.h	(working copy)
>@@ -57,6 +57,11 @@ enum {
> 
> WTF_EXTERN_C_BEGIN
> 
>+#if PLATFORM(MAC)
>+#define _SECURITY_SECTRUSTEDAPPLICATION_H_
>+OSStatus SecTrustedApplicationCreateFromPath(const char* path, SecTrustedApplicationRef*);
>+#endif
>+
> SecSignatureHashAlgorithm SecCertificateGetSignatureHashAlgorithm(SecCertificateRef);
> 
> WTF_EXTERN_C_END
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246738)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-06-24  Greg Doolittle  <gr3g@apple.com>
> 
>         Web Inspector: AXI: Audit: image label test is throwing spurious errors on elements with existing alt attr, but no value: <img alt>
>Index: Source/WebCore/WebCorePrefix.h
>===================================================================
>--- Source/WebCore/WebCorePrefix.h	(revision 246738)
>+++ Source/WebCore/WebCorePrefix.h	(working copy)
>@@ -149,6 +149,7 @@
> #endif
> 
> #if PLATFORM(MAC)
>+#define _SECURITY_SECTRUSTEDAPPLICATION_H_
> #include <CoreServices/CoreServices.h>
> #endif
> 
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246738)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/spi/cf/CFNetworkSPI.h: Add new NSURLSessionConfiguration SPI.
>+        * pal/spi/mac/AVFoundationSPI.h: resourceConservationLevelWhilePaused should
>+        be defined after AVPlayerResourceConservationLevel.
>+
> 2019-06-19  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Network: replace CFNetwork SPI with new API where able
>Index: Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	(revision 246738)
>+++ Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	(working copy)
>@@ -199,6 +199,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 246738)
>+++ 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/crypto/mac/SerializedCryptoKeyWrapMac.mm
>===================================================================
>--- Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm	(revision 246738)
>+++ 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 246738)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/Cocoa/SOAuthorization/SOAuthorizationSession.h: AppSSO is SPI.
>+        * WebKit2Prefix.h: Some Foundation headers declares some functions unavailable
>+        on Mac that are actually SPI, exclude this header.
>+
> 2019-06-24  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Fixes for compilation with unified builds disabled
>Index: Source/WebKit/WebKit2Prefix.h
>===================================================================
>--- Source/WebKit/WebKit2Prefix.h	(revision 246738)
>+++ Source/WebKit/WebKit2Prefix.h	(working copy)
>@@ -38,6 +38,7 @@
> #include <CoreGraphics/CoreGraphics.h>
> 
> #ifdef __OBJC__
>+#define _SECURITY_SECTASK_H_
> #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 246738)
>+++ 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/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 246738)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView/WebHTMLView.mm: Add new NSView and NSWindow SPI.
>+        * WebView/WebView.mm: Add new NSView SPI.
>+
> 2019-06-16  Darin Adler  <darin@apple.com>
> 
>         Rename AtomicString to AtomString
>Index: Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(revision 246738)
>+++ Source/WebKitLegacy/mac/WebView/WebHTMLView.mm	(working copy)
>@@ -207,12 +207,26 @@ - (NSTextInputContext *)inputContext;
> @end
> 
> @interface NSView ()
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
>+{
>+@protected
>+    NSArray<NSView *> *_subviews;
>+}
>+#endif
>+
> - (BOOL)_drawnByAncestor;
> - (void)_invalidateGStatesForTree;
> - (void)_windowChangedKeyState;
> @end
> 
> @interface NSWindow ()
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
>+{
>+@protected
>+    NSView *_borderView;
>+}
>+#endif
>+
> - (id)_newFirstResponderAfterResigning;
> @end
> 
>Index: Source/WebKitLegacy/mac/WebView/WebView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebView.mm	(revision 246738)
>+++ Source/WebKitLegacy/mac/WebView/WebView.mm	(working copy)
>@@ -357,6 +357,15 @@ @interface NSSpellChecker (WebNSSpellChe
> - (void)_preflightChosenSpellServer;
> @end
> 
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500
>+@interface NSView ()
>+{
>+@protected
>+    NSArray<NSView *> *_subviews;
>+}
>+@end
>+#endif
>+
> @interface NSView (WebNSViewDetails)
> - (NSView *)_hitTest:(NSPoint *)aPoint dragTypes:(NSSet *)types;
> - (void)_autoscrollForDraggingInfo:(id)dragInfo timeDelta:(NSTimeInterval)repeatDelta;
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246812)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig: Add Mac framework stubs.
>+
> 2019-06-25  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Occasional crash under -[UIPreviewTarget initWithContainer:center:transform:] when generating a drag preview
>Index: Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	(revision 246738)
>+++ 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 246738)
>+++ WebKitLibraries/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-06-25  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [Catalina] Enable WebKit build
>+        https://bugs.webkit.org/show_bug.cgi?id=199209
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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