Changeset 255709 in webkit


Ignore:
Timestamp:
Feb 4, 2020, 3:36:21 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Fix Mac CMake build
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:
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/Source/JavaScriptCore/ChangeLog

    r255703 r255709  
     12020-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=207231
     5
     6        * PlatformMac.cmake:
     7
    182020-02-04  Yusuke Suzuki  <ysuzuki@apple.com>
    29
  • TabularUnified trunk/Source/JavaScriptCore/PlatformMac.cmake

    r251855 r255709  
    3434)
    3535
    36 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
     36set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} -force_load ${CMAKE_BINARY_DIR}/lib/libWTF.a")
    3737
    3838# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
  • TabularUnified trunk/Source/WebCore/ChangeLog

    r255693 r255709  
     12020-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=207231
     5
     6        * PlatformMac.cmake:
     7        * platform/ios/WebItemProviderPasteboard.h:
     8
    192020-02-04  Rob Buis  <rbuis@igalia.com>
    210
  • TabularUnified trunk/Source/WebCore/PAL/ChangeLog

    r255660 r255709  
     12020-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=207231
     5
     6        * pal/PlatformMac.cmake:
     7
    182020-02-03  Jiewen Tan  <jiewen_tan@apple.com>
    29
  • TabularUnified trunk/Source/WebCore/PAL/pal/PlatformMac.cmake

    r253702 r255709  
    3838    spi/cocoa/MetalSPI.h
    3939    spi/cocoa/NEFilterSourceSPI.h
     40    spi/cocoa/NSAccessibilitySPI.h
    4041    spi/cocoa/NSAttributedStringSPI.h
    4142    spi/cocoa/NSButtonCellSPI.h
     
    7273    spi/mac/LookupSPI.h
    7374    spi/mac/MediaRemoteSPI.h
    74     spi/mac/NSAccessibilitySPI.h
    7575    spi/mac/NSAppearanceSPI.h
    7676    spi/mac/NSApplicationSPI.h
  • TabularUnified trunk/Source/WebCore/PlatformMac.cmake

    r255167 r255709  
    2020find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
    2121find_library(XML2_LIBRARY XML2)
    22 find_package(Sqlite REQUIRED)
     22find_package(Sqlite3 REQUIRED)
    2323find_package(ZLIB REQUIRED)
    2424
     
    4646    ${QUARTZCORE_LIBRARY}
    4747    ${SECURITY_LIBRARY}
    48     ${SQLITE_LIBRARIES}
     48    ${SQLITE3_LIBRARIES}
    4949    ${SYSTEMCONFIGURATION_LIBRARY}
    5050    ${XML2_LIBRARY}
     
    224224    platform/cocoa/SearchPopupMenuCocoa.mm
    225225    platform/cocoa/SharedBufferCocoa.mm
     226    platform/cocoa/SystemBattery.mm
    226227    platform/cocoa/SystemVersion.mm
    227228    platform/cocoa/TelephoneNumberDetectorCocoa.cpp
     
    455456    bridge/objc/WebScriptObjectPrivate.h
    456457
     458    crypto/CryptoAlgorithmIdentifier.h
     459    crypto/CryptoKey.h
     460    crypto/CryptoKeyType.h
     461    crypto/CryptoKeyUsage.h
     462    crypto/CryptoKeyPair.h
     463    crypto/CommonCryptoUtilities.h
     464
     465    crypto/keys/CryptoKeyHMAC.h
     466    crypto/keys/CryptoAesKeyAlgorithm.h
     467    crypto/keys/CryptoEcKeyAlgorithm.h
     468    crypto/keys/CryptoHmacKeyAlgorithm.h
     469    crypto/keys/CryptoKeyAES.h
     470    crypto/keys/CryptoKeyAlgorithm.h
     471    crypto/keys/CryptoRsaHashedKeyAlgorithm.h
     472    crypto/keys/CryptoRsaKeyAlgorithm.h
     473    crypto/keys/CryptoKeyEC.h
     474
    457475    editing/cocoa/AutofillElements.h
    458476    editing/cocoa/DataDetection.h
     
    468486    loader/mac/LoaderNSURLExtras.h
    469487
     488    Modules/webauthn/AuthenticatorAssertionResponse.h
     489    Modules/webauthn/AuthenticatorResponse.h
     490    Modules/webauthn/AuthenticatorAttestationResponse.h
     491
     492    Modules/webauthn/fido/Pin.h
     493
    470494    page/mac/TextIndicatorWindow.h
    471495    page/mac/WebCoreFrameView.h
     
    483507
    484508    platform/PictureInPictureSupport.h
     509    platform/PlatformContentFilter.h
    485510
    486511    platform/audio/cocoa/MediaSessionManagerCocoa.h
     
    492517    platform/cf/RunLoopObserver.h
    493518
     519    platform/cocoa/NetworkExtensionContentFilter.h
    494520    platform/cocoa/PlatformView.h
    495521    platform/cocoa/PlaybackSessionInterface.h
     
    499525    platform/cocoa/ScrollSnapAnimatorState.h
    500526    platform/cocoa/SearchPopupMenuCocoa.h
     527    platform/cocoa/SystemBattery.h
    501528    platform/cocoa/SystemVersion.h
    502529    platform/cocoa/VideoFullscreenChangeObserver.h
     
    509536    platform/gamepad/mac/HIDGamepad.h
    510537    platform/gamepad/mac/HIDGamepadProvider.h
     538
     539    platform/graphics/MIMETypeCache.h
    511540
    512541    platform/graphics/avfoundation/MediaPlaybackTargetCocoa.h
     
    564593    platform/mac/WebPlaybackControlsManager.h
    565594
     595    platform/mediastream/RealtimeMediaSourceIdentifier.h
     596
    566597    platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
    567598
     
    582613    platform/network/cocoa/CookieStorageObserver.h
    583614    platform/network/cocoa/CredentialCocoa.h
     615    platform/network/cocoa/HTTPCookieAcceptPolicyCocoa.h
    584616    platform/network/cocoa/ProtectionSpaceCocoa.h
    585617    platform/network/cocoa/WebCoreNSURLSession.h
  • TabularUnified trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

    r255144 r255709  
    2424 */
    2525
     26#if TARGET_OS_IOS
     27
    2628#import <WebCore/AbstractPasteboard.h>
    27 
    28 #if TARGET_OS_IOS
    2929
    3030struct CGSize;
  • TabularUnified trunk/Source/WebKit/ChangeLog

    r255706 r255709  
     12020-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=207231
     5
     6        * PlatformMac.cmake:
     7        * WebProcess/WebPage/mac/WebPageMac.mm:
     8        (WebKit::WebPage::updateVisibleContentRects):
     9
    1102020-02-04  Chris Dumez  <cdumez@apple.com>
    211
  • TabularUnified trunk/Source/WebKit/PlatformMac.cmake

    r255214 r255709  
    1515set(MACOSX_FRAMEWORK_IDENTIFIER com.apple.WebKit)
    1616
    17 list(APPEND WebKit_LIBRARIES
     17list(APPEND WebKit_PRIVATE_LIBRARIES
    1818    WebKitLegacy
    1919    ${APPLICATIONSERVICES_LIBRARY}
     
    4242
    4343    WebProcess/InjectedBundle/API/c/mac/WKBundlePageMac.mm
     44)
     45
     46list(APPEND WebKit_SOURCES
     47    UIProcess/API/Cocoa/_WKContentWorld.mm
     48    UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.mm
     49    UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.mm
    4450)
    4551
     
    5359    "${WEBKIT_DIR}/UIProcess/API/Cocoa"
    5460    "${WEBKIT_DIR}/UIProcess/API/mac"
     61    "${WEBKIT_DIR}/UIProcess/API/ios"
    5562    "${WEBKIT_DIR}/UIProcess/Authentication/cocoa"
    5663    "${WEBKIT_DIR}/UIProcess/Cocoa"
     
    151158
    152159list(APPEND WebKit_MESSAGES_IN_FILES
     160    GPUProcess/GPUConnectionToWebProcess.messages.in
     161    GPUProcess/GPUProcess.messages.in
     162
     163    GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
     164    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
     165    GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in
     166    GPUProcess/webrtc/RemoteMediaRecorderManager.messages.in
     167    GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in
     168    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
     169    GPUProcess/webrtc/RemoteMediaRecorder.messages.in
     170    GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in
     171    GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
     172
     173    GPUProcess/media/RemoteMediaPlayerProxy.messages.in
     174    GPUProcess/media/RemoteMediaResourceManager.messages.in
     175    GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in
     176   
    153177    NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
    154178
     
    163187    UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
    164188
     189    UIProcess/GPU/GPUProcessProxy.messages.in
     190
    165191    UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
    166192
     
    179205    WebProcess/cocoa/VideoFullscreenManager.messages.in
    180206
     207    WebProcess/GPU/GPUProcessConnection.messages.in
     208
     209    WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in
     210    WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in
     211
    181212    WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
     213    WebProcess/WebPage/ViewUpdateDispatcher.messages.in
    182214
    183215    WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.messages.in
     
    210242    UIProcess/API/C/mac
    211243    UIProcess/API/cpp
     244    UIProcess/API/ios
    212245
    213246    WebProcess/InjectedBundle/API/Cocoa
     
    227260    endif ()
    228261endforeach ()
     262if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h)
     263    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h "#import <WebKit/UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h>")
     264endif ()
     265if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h)
     266    file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h "#import <WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h>")
     267endif ()
    229268
    230269# FIXME: Forwarding headers should be complete copies of the header.
  • TabularUnified trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

    r255106 r255709  
    10231023}
    10241024
     1025void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo&, MonotonicTime)
     1026{
     1027}
     1028
    10251029#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY)
    10261030void WebPage::playbackTargetSelected(uint64_t contextId, const WebCore::MediaPlaybackTargetContext& targetContext) const
  • TabularUnified trunk/Tools/ChangeLog

    r255708 r255709  
     12020-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Fix Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=207231
     5
     6        * DumpRenderTree/PlatformMac.cmake:
     7        * MiniBrowser/mac/CMakeLists.txt:
     8        * MiniBrowser/mac/WK2BrowserWindowController.m:
     9        (-[WK2BrowserWindowController awakeFromNib]):
     10        * WebKitTestRunner/PlatformMac.cmake:
     11
    1122020-02-04  Don Olmstead  <don.olmstead@sony.com>
    213
  • TabularUnified trunk/Tools/DumpRenderTree/PlatformMac.cmake

    r251855 r255709  
    2626    cg
    2727    cf
     28    cocoa
    2829    mac
    2930    mac/InternalHeaders/WebKit
     
    7576list(APPEND DumpRenderTree_ObjCpp_SOURCES
    7677    DefaultPolicyDelegate.mm
     78    cocoa/UIScriptControllerCocoa.mm
    7779    mac/AccessibilityCommonMac.mm
    7880    mac/AccessibilityControllerMac.mm
  • TabularUnified trunk/Tools/MiniBrowser/mac/CMakeLists.txt

    r250591 r255709  
    1919    ${CMAKE_SOURCE_DIR}/Source
    2020    ${FORWARDING_HEADERS_DIR}
     21    ${FORWARDING_HEADERS_DIR}/WebKit
    2122    ${MINIBROWSER_DIR}
    2223)
  • TabularUnified trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

    r255543 r255709  
    127127    _textFinder.findBarContainer = self;
    128128   
     129#if __has_feature(objc_arc)
    129130    __weak WKWebView *weakWebView = _webView;
     131#else
     132    WKWebView *weakWebView = _webView;
     133#endif
    130134    _textFinder.hideInterfaceCallback = ^{
    131135        WKWebView *webView = weakWebView;
  • TabularUnified trunk/Tools/WebKitTestRunner/PlatformMac.cmake

    r251831 r255709  
    2323    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    2424    ${FORWARDING_HEADERS_DIR}/WebCore
     25    ${FORWARDING_HEADERS_DIR}/WebKit
    2526    ${ICU_INCLUDE_DIRS}
    2627    ${WEBCORE_DIR}/testing/cocoa
     
    8687   
    8788    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm
     89    ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/PlatformViewHelpers.mm
    8890
    8991    ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
Note: See TracChangeset for help on using the changeset viewer.