Fix Mac CMake build
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Feb 2020 23:36:21 +0000 (23:36 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Feb 2020 23:36:21 +0000 (23:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=207231

Source/JavaScriptCore:

* PlatformMac.cmake:

Source/WebCore:

* PlatformMac.cmake:
* platform/ios/WebItemProviderPasteboard.h:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WebKit:

* PlatformMac.cmake:
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::updateVisibleContentRects):

Tools:

* DumpRenderTree/PlatformMac.cmake:
* MiniBrowser/mac/CMakeLists.txt:
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
* WebKitTestRunner/PlatformMac.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/PlatformMac.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/platform/ios/WebItemProviderPasteboard.h
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
Tools/ChangeLog
Tools/DumpRenderTree/PlatformMac.cmake
Tools/MiniBrowser/mac/CMakeLists.txt
Tools/MiniBrowser/mac/WK2BrowserWindowController.m
Tools/WebKitTestRunner/PlatformMac.cmake

index 7af34cb..16a733c 100644 (file)
@@ -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-04  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Use PackedRefPtr in UnlinkedCodeBlock
index e0ca6ec..0907714 100644 (file)
@@ -33,7 +33,7 @@ list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
     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 a6dd3d3..5aaa1ad 100644 (file)
@@ -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-04  Rob Buis  <rbuis@igalia.com>
 
         Tighten up stylesheet loading
index 7ba5231..228a26a 100644 (file)
@@ -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-02-03  Jiewen Tan  <jiewen_tan@apple.com>
 
         Pass a hint from the extension to decidePolicyForSOAuthorizationLoadWithCurrentPolicy
index 219724d..dc7d3d8 100644 (file)
@@ -37,6 +37,7 @@ list(APPEND PAL_PUBLIC_HEADERS
     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 @@ list(APPEND PAL_PUBLIC_HEADERS
     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 aec3206..199b6dd 100644 (file)
@@ -19,7 +19,7 @@ find_library(QUARTZCORE_LIBRARY QuartzCore)
 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 @@ list(APPEND WebCore_LIBRARIES
     ${QUARTZ_LIBRARY}
     ${QUARTZCORE_LIBRARY}
     ${SECURITY_LIBRARY}
-    ${SQLITE_LIBRARIES}
+    ${SQLITE3_LIBRARIES}
     ${SYSTEMCONFIGURATION_LIBRARY}
     ${XML2_LIBRARY}
     ${ZLIB_LIBRARY}
@@ -223,6 +223,7 @@ list(APPEND WebCore_SOURCES
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
 
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
 
     platform/cf/RunLoopObserver.h
 
+    platform/cocoa/NetworkExtensionContentFilter.h
     platform/cocoa/PlatformView.h
     platform/cocoa/PlaybackSessionInterface.h
     platform/cocoa/PlaybackSessionModel.h
@@ -498,6 +524,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
     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 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
 
     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 0cc4832..2fde415 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <WebCore/AbstractPasteboard.h>
-
 #if TARGET_OS_IOS
 
+#import <WebCore/AbstractPasteboard.h>
+
 struct CGSize;
 
 typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {
index d02a0eb..340dfb7 100644 (file)
@@ -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-04  Chris Dumez  <cdumez@apple.com>
 
         Partial revert of r248734 to fix leak of StorageAreaMaps
index be86f73..5c3074e 100644 (file)
@@ -14,7 +14,7 @@ add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
 
 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 @@ list(APPEND WebKit_SOURCES
     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 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
     "${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 @@ set(WebKit_FORWARDING_HEADERS_FILES
 )
 
 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 @@ list(APPEND WebKit_MESSAGES_IN_FILES
     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 @@ list(APPEND WebKit_MESSAGES_IN_FILES
     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 @@ set(WebKit_FORWARDING_HEADERS_DIRECTORIES
     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 @@ foreach (_file ${ObjCHeaders})
         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 9ff72b9..c42077f 100644 (file)
@@ -1022,6 +1022,10 @@ void WebPage::dataDetectorsDidHideUI(PageOverlay::PageOverlayID overlayID)
     }
 }
 
+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 0afe6f0..c3c7743 100644 (file)
@@ -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  Don Olmstead  <don.olmstead@sony.com>
 
         [PlayStation] Enable TestWebKit
index a206eae..8738733 100644 (file)
@@ -25,6 +25,7 @@ list(APPEND DumpRenderTree_LIBRARIES
 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     cg
     cf
+    cocoa
     mac
     mac/InternalHeaders/WebKit
     TestNetscapePlugIn
@@ -74,6 +75,7 @@ list(APPEND DumpRenderTree_Cpp_SOURCES
 
 list(APPEND DumpRenderTree_ObjCpp_SOURCES
     DefaultPolicyDelegate.mm
+    cocoa/UIScriptControllerCocoa.mm
     mac/AccessibilityCommonMac.mm
     mac/AccessibilityControllerMac.mm
     mac/AccessibilityNotificationHandler.mm
index e6f23de..fc81368 100644 (file)
@@ -18,6 +18,7 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
     ${CMAKE_SOURCE_DIR}/Source/WebKitLegacy
     ${CMAKE_SOURCE_DIR}/Source
     ${FORWARDING_HEADERS_DIR}
+    ${FORWARDING_HEADERS_DIR}/WebKit
     ${MINIBROWSER_DIR}
 )
 
index 939cbaf..f503702 100644 (file)
@@ -126,7 +126,11 @@ static const int testFooterBannerHeight = 58;
     _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 54d2bfa..6322ffd 100644 (file)
@@ -22,6 +22,7 @@ list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${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 @@ list(APPEND WebKitTestRunner_SOURCES
     ${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