Attachment 389715 Details for Bug 207231 – patch

[patch] patch

patch (text/plain), 15.66 KB, created by Alex Christensen on 2020-02-04 15:00:16 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2020-02-04 15:00:16 PST

Size: 15.66 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 255611)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,10 @@
>+2020-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=207231
>+
>+        * PlatformMac.cmake:
>+
> 2020-02-03  Alexey Shvayka  <shvaikalesh@gmail.com>
> 
>         \0 identity escapes should be syntax errors in Unicode patterns only
>Index: Source/JavaScriptCore/PlatformMac.cmake
>===================================================================
>--- Source/JavaScriptCore/PlatformMac.cmake	(revision 255611)
>+++ Source/JavaScriptCore/PlatformMac.cmake	(working copy)
>@@ -33,7 +33,7 @@
>     inspector/remote/cocoa/RemoteInspectorXPCConnection.h
> )
> 
>-set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
>+set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -force_load ${CMAKE_BINARY_DIR}/lib/libWTF.a")
> 
> # FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
> if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h)
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 255611)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,11 @@
>+2020-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=207231
>+
>+        * PlatformMac.cmake:
>+        * platform/ios/WebItemProviderPasteboard.h:
>+
> 2020-02-03  Jer Noble  <jer.noble@apple.com>
> 
>         Unreviewed iOS build fix; lambdas need an arrow operator between the paramaters and return type.
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 255611)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,10 @@
>+2020-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=207231
>+
>+        * pal/PlatformMac.cmake:
>+
> 2020-01-31  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Add support for specifying background colors when setting marked text
>Index: Source/WebCore/PAL/pal/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformMac.cmake	(revision 255611)
>+++ Source/WebCore/PAL/pal/PlatformMac.cmake	(working copy)
>@@ -37,6 +37,7 @@
>     spi/cocoa/LaunchServicesSPI.h
>     spi/cocoa/MetalSPI.h
>     spi/cocoa/NEFilterSourceSPI.h
>+    spi/cocoa/NSAccessibilitySPI.h
>     spi/cocoa/NSAttributedStringSPI.h
>     spi/cocoa/NSButtonCellSPI.h
>     spi/cocoa/NSCalendarDateSPI.h
>@@ -71,7 +72,6 @@
>     spi/mac/HIToolboxSPI.h
>     spi/mac/LookupSPI.h
>     spi/mac/MediaRemoteSPI.h
>-    spi/mac/NSAccessibilitySPI.h
>     spi/mac/NSAppearanceSPI.h
>     spi/mac/NSApplicationSPI.h
>     spi/mac/NSCellSPI.h
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 255611)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -19,7 +19,7 @@
> find_library(SECURITY_LIBRARY Security)
> find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
> find_library(XML2_LIBRARY XML2)
>-find_package(Sqlite REQUIRED)
>+find_package(Sqlite3 REQUIRED)
> find_package(ZLIB REQUIRED)
> 
> list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>@@ -45,7 +45,7 @@
>     ${QUARTZ_LIBRARY}
>     ${QUARTZCORE_LIBRARY}
>     ${SECURITY_LIBRARY}
>-    ${SQLITE_LIBRARIES}
>+    ${SQLITE3_LIBRARIES}
>     ${SYSTEMCONFIGURATION_LIBRARY}
>     ${XML2_LIBRARY}
>     ${ZLIB_LIBRARY}
>@@ -223,6 +223,7 @@
>     platform/cocoa/ScrollSnapAnimatorState.mm
>     platform/cocoa/SearchPopupMenuCocoa.mm
>     platform/cocoa/SharedBufferCocoa.mm
>+    platform/cocoa/SystemBattery.mm
>     platform/cocoa/SystemVersion.mm
>     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
>     platform/cocoa/ThemeCocoa.mm
>@@ -454,6 +455,23 @@
>     bridge/objc/WebScriptObject.h
>     bridge/objc/WebScriptObjectPrivate.h
> 
>+    crypto/CryptoAlgorithmIdentifier.h
>+    crypto/CryptoKey.h
>+    crypto/CryptoKeyType.h
>+    crypto/CryptoKeyUsage.h
>+    crypto/CryptoKeyPair.h
>+    crypto/CommonCryptoUtilities.h
>+
>+    crypto/keys/CryptoKeyHMAC.h
>+    crypto/keys/CryptoAesKeyAlgorithm.h
>+    crypto/keys/CryptoEcKeyAlgorithm.h
>+    crypto/keys/CryptoHmacKeyAlgorithm.h
>+    crypto/keys/CryptoKeyAES.h
>+    crypto/keys/CryptoKeyAlgorithm.h
>+    crypto/keys/CryptoRsaHashedKeyAlgorithm.h
>+    crypto/keys/CryptoRsaKeyAlgorithm.h
>+    crypto/keys/CryptoKeyEC.h
>+
>     editing/cocoa/AutofillElements.h
>     editing/cocoa/DataDetection.h
>     editing/cocoa/HTMLConverter.h
>@@ -467,6 +485,12 @@
> 
>     loader/mac/LoaderNSURLExtras.h
> 
>+    Modules/webauthn/AuthenticatorAssertionResponse.h
>+    Modules/webauthn/AuthenticatorResponse.h
>+    Modules/webauthn/AuthenticatorAttestationResponse.h
>+
>+    Modules/webauthn/fido/Pin.h
>+
>     page/mac/TextIndicatorWindow.h
>     page/mac/WebCoreFrameView.h
> 
>@@ -482,6 +506,7 @@
>     page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h
> 
>     platform/PictureInPictureSupport.h
>+    platform/PlatformContentFilter.h
> 
>     platform/audio/cocoa/MediaSessionManagerCocoa.h
>     platform/audio/cocoa/WebAudioBufferList.h
>@@ -491,6 +516,7 @@
> 
>     platform/cf/RunLoopObserver.h
> 
>+    platform/cocoa/NetworkExtensionContentFilter.h
>     platform/cocoa/PlatformView.h
>     platform/cocoa/PlaybackSessionInterface.h
>     platform/cocoa/PlaybackSessionModel.h
>@@ -498,6 +524,7 @@
>     platform/cocoa/ScrollController.h
>     platform/cocoa/ScrollSnapAnimatorState.h
>     platform/cocoa/SearchPopupMenuCocoa.h
>+    platform/cocoa/SystemBattery.h
>     platform/cocoa/SystemVersion.h
>     platform/cocoa/VideoFullscreenChangeObserver.h
>     platform/cocoa/VideoFullscreenModel.h
>@@ -509,6 +536,8 @@
>     platform/gamepad/mac/HIDGamepad.h
>     platform/gamepad/mac/HIDGamepadProvider.h
> 
>+    platform/graphics/MIMETypeCache.h
>+
>     platform/graphics/avfoundation/MediaPlaybackTargetCocoa.h
>     platform/graphics/avfoundation/WebMediaSessionManagerMac.h
> 
>@@ -563,6 +592,8 @@
>     platform/mac/WebNSAttributedStringExtras.h
>     platform/mac/WebPlaybackControlsManager.h
> 
>+    platform/mediastream/RealtimeMediaSourceIdentifier.h
>+
>     platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
> 
>     platform/mediastream/mac/WebAudioSourceProviderAVFObjC.h
>@@ -581,6 +612,7 @@
> 
>     platform/network/cocoa/CookieStorageObserver.h
>     platform/network/cocoa/CredentialCocoa.h
>+    platform/network/cocoa/HTTPCookieAcceptPolicyCocoa.h
>     platform/network/cocoa/ProtectionSpaceCocoa.h
>     platform/network/cocoa/WebCoreNSURLSession.h
> 
>Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.h
>===================================================================
>--- Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(revision 255611)
>+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(working copy)
>@@ -23,10 +23,10 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+#if TARGET_OS_IOS
>+
> #import <WebCore/AbstractPasteboard.h>
> 
>-#if TARGET_OS_IOS
>-
> struct CGSize;
> 
> typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 255611)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2020-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=207231
>+
>+        * PlatformMac.cmake:
>+        * WebProcess/WebPage/mac/WebPageMac.mm:
>+        (WebKit::WebPage::updateVisibleContentRects):
>+
> 2020-02-03  Chris Dumez  <cdumez@apple.com>
> 
>         [WK2] Use per-UIProcess default cookie storage for Mac Catalyst apps
>Index: Source/WebKit/PlatformMac.cmake
>===================================================================
>--- Source/WebKit/PlatformMac.cmake	(revision 255611)
>+++ Source/WebKit/PlatformMac.cmake	(working copy)
>@@ -14,7 +14,7 @@
> 
> set(MACOSX_FRAMEWORK_IDENTIFIER com.apple.WebKit)
> 
>-list(APPEND WebKit_LIBRARIES
>+list(APPEND WebKit_PRIVATE_LIBRARIES
>     WebKitLegacy
>     ${APPLICATIONSERVICES_LIBRARY}
>     ${DEVICEIDENTITY_LIBRARY}
>@@ -43,6 +43,12 @@
>     WebProcess/InjectedBundle/API/c/mac/WKBundlePageMac.mm
> )
> 
>+list(APPEND WebKit_SOURCES
>+    UIProcess/API/Cocoa/_WKContentWorld.mm
>+    UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.mm
>+    UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.mm
>+)
>+
> list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
>     "${ICU_INCLUDE_DIRS}"
>     "${WEBKIT_DIR}/NetworkProcess/cocoa"
>@@ -52,6 +58,7 @@
>     "${WEBKIT_DIR}/UIProcess/API/C/mac"
>     "${WEBKIT_DIR}/UIProcess/API/Cocoa"
>     "${WEBKIT_DIR}/UIProcess/API/mac"
>+    "${WEBKIT_DIR}/UIProcess/API/ios"
>     "${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
>     "${WEBKIT_DIR}/UIProcess/Cocoa"
>     "${WEBKIT_DIR}/UIProcess/Cocoa/SOAuthorization"
>@@ -150,6 +157,23 @@
> )
> 
> list(APPEND WebKit_MESSAGES_IN_FILES
>+    GPUProcess/GPUConnectionToWebProcess.messages.in
>+    GPUProcess/GPUProcess.messages.in
>+
>+    GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
>+    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
>+    GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in
>+    GPUProcess/webrtc/RemoteMediaRecorderManager.messages.in
>+    GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in
>+    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
>+    GPUProcess/webrtc/RemoteMediaRecorder.messages.in
>+    GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in
>+    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
>+
>+    GPUProcess/media/RemoteMediaPlayerProxy.messages.in
>+    GPUProcess/media/RemoteMediaResourceManager.messages.in
>+    GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in
>+    
>     NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
> 
>     Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in
>@@ -162,6 +186,8 @@
>     UIProcess/Cocoa/UserMediaCaptureManagerProxy.messages.in
>     UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
> 
>+    UIProcess/GPU/GPUProcessProxy.messages.in
>+
>     UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
> 
>     UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
>@@ -178,7 +204,13 @@
>     WebProcess/cocoa/UserMediaCaptureManager.messages.in
>     WebProcess/cocoa/VideoFullscreenManager.messages.in
> 
>+    WebProcess/GPU/GPUProcessConnection.messages.in
>+
>+    WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in
>+    WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in
>+
>     WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
>+    WebProcess/WebPage/ViewUpdateDispatcher.messages.in
> 
>     WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.messages.in
> 
>@@ -209,6 +241,7 @@
>     UIProcess/API/C/Cocoa
>     UIProcess/API/C/mac
>     UIProcess/API/cpp
>+    UIProcess/API/ios
> 
>     WebProcess/InjectedBundle/API/Cocoa
>     WebProcess/InjectedBundle/API/c
>@@ -226,6 +259,12 @@
>         file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/${_name} "#import <WebKit/UIProcess/API/Cocoa/${_name}>")
>     endif ()
> endforeach ()
>+if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h)
>+    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h "#import <WebKit/UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h>")
>+endif ()
>+if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h)
>+    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h "#import <WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h>")
>+endif ()
> 
> # FIXME: Forwarding headers should be complete copies of the header.
> set(WebKitLegacyForwardingHeaders
>Index: Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(revision 255611)
>+++ Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(working copy)
>@@ -1022,6 +1022,10 @@
>     }
> }
> 
>+void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo&, MonotonicTime)
>+{
>+}
>+
> #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
> void WebPage::playbackTargetSelected(uint64_t contextId, const WebCore::MediaPlaybackTargetContext& targetContext) const
> {
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 255703)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2020-02-04  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=207231
>+
>+        * DumpRenderTree/PlatformMac.cmake:
>+        * MiniBrowser/mac/CMakeLists.txt:
>+        * MiniBrowser/mac/WK2BrowserWindowController.m:
>+        (-[WK2BrowserWindowController awakeFromNib]):
>+        * WebKitTestRunner/PlatformMac.cmake:
>+
> 2020-02-04  Jonathan Bedard  <jbedard@apple.com>
> 
>         results.webkit.org: Support branches in run-javascriptcore-tests
>Index: Tools/DumpRenderTree/PlatformMac.cmake
>===================================================================
>--- Tools/DumpRenderTree/PlatformMac.cmake	(revision 255611)
>+++ Tools/DumpRenderTree/PlatformMac.cmake	(working copy)
>@@ -25,6 +25,7 @@
> list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
>     cg
>     cf
>+    cocoa
>     mac
>     mac/InternalHeaders/WebKit
>     TestNetscapePlugIn
>@@ -74,6 +75,7 @@
> 
> list(APPEND DumpRenderTree_ObjCpp_SOURCES
>     DefaultPolicyDelegate.mm
>+    cocoa/UIScriptControllerCocoa.mm
>     mac/AccessibilityCommonMac.mm
>     mac/AccessibilityControllerMac.mm
>     mac/AccessibilityNotificationHandler.mm
>Index: Tools/MiniBrowser/mac/CMakeLists.txt
>===================================================================
>--- Tools/MiniBrowser/mac/CMakeLists.txt	(revision 255611)
>+++ Tools/MiniBrowser/mac/CMakeLists.txt	(working copy)
>@@ -18,6 +18,7 @@
>     ${CMAKE_SOURCE_DIR}/Source/WebKitLegacy
>     ${CMAKE_SOURCE_DIR}/Source
>     ${FORWARDING_HEADERS_DIR}
>+    ${FORWARDING_HEADERS_DIR}/WebKit
>     ${MINIBROWSER_DIR}
> )
> 
>Index: Tools/MiniBrowser/mac/WK2BrowserWindowController.m
>===================================================================
>--- Tools/MiniBrowser/mac/WK2BrowserWindowController.m	(revision 255611)
>+++ Tools/MiniBrowser/mac/WK2BrowserWindowController.m	(working copy)
>@@ -126,7 +126,11 @@
>     _textFinder.client = _webView;
>     _textFinder.findBarContainer = self;
>     
>+#if __has_feature(objc_arc)
>     __weak WKWebView *weakWebView = _webView;
>+#else
>+    WKWebView *weakWebView = _webView;
>+#endif
>     _textFinder.hideInterfaceCallback = ^{
>         WKWebView *webView = weakWebView;
>         [webView _hideFindUI];
>Index: Tools/WebKitTestRunner/PlatformMac.cmake
>===================================================================
>--- Tools/WebKitTestRunner/PlatformMac.cmake	(revision 255611)
>+++ Tools/WebKitTestRunner/PlatformMac.cmake	(working copy)
>@@ -22,6 +22,7 @@
>     ${FORWARDING_HEADERS_DIR}
>     ${FORWARDING_HEADERS_DIR}/JavaScriptCore
>     ${FORWARDING_HEADERS_DIR}/WebCore
>+    ${FORWARDING_HEADERS_DIR}/WebKit
>     ${ICU_INCLUDE_DIRS}
>     ${WEBCORE_DIR}/testing/cocoa
>     ${WEBKITLEGACY_DIR}
>@@ -85,6 +86,7 @@
>     ${WEBKIT_TESTRUNNER_DIR}/mac/main.mm
>     
>     ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
>+    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/PlatformViewHelpers.mm
> 
>     ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
>     ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/SharedEventStreamsMac.mm

Actions: View | Formatted Diff | Diff

Attachments on bug 207231: 389715