Changeset 255709 in webkit
- Timestamp:
- Feb 4, 2020, 3:36:21 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Source/JavaScriptCore/ChangeLog ¶
r255703 r255709 1 2020-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 1 8 2020-02-04 Yusuke Suzuki <ysuzuki@apple.com> 2 9 -
TabularUnified trunk/Source/JavaScriptCore/PlatformMac.cmake ¶
r251855 r255709 34 34 ) 35 35 36 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION} ")36 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") 37 37 38 38 # FIXME: Make including these files consistent in the source so these forwarding headers are not needed. -
TabularUnified trunk/Source/WebCore/ChangeLog ¶
r255693 r255709 1 2020-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 1 9 2020-02-04 Rob Buis <rbuis@igalia.com> 2 10 -
TabularUnified trunk/Source/WebCore/PAL/ChangeLog ¶
r255660 r255709 1 2020-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 1 8 2020-02-03 Jiewen Tan <jiewen_tan@apple.com> 2 9 -
TabularUnified trunk/Source/WebCore/PAL/pal/PlatformMac.cmake ¶
r253702 r255709 38 38 spi/cocoa/MetalSPI.h 39 39 spi/cocoa/NEFilterSourceSPI.h 40 spi/cocoa/NSAccessibilitySPI.h 40 41 spi/cocoa/NSAttributedStringSPI.h 41 42 spi/cocoa/NSButtonCellSPI.h … … 72 73 spi/mac/LookupSPI.h 73 74 spi/mac/MediaRemoteSPI.h 74 spi/mac/NSAccessibilitySPI.h75 75 spi/mac/NSAppearanceSPI.h 76 76 spi/mac/NSApplicationSPI.h -
TabularUnified trunk/Source/WebCore/PlatformMac.cmake ¶
r255167 r255709 20 20 find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) 21 21 find_library(XML2_LIBRARY XML2) 22 find_package(Sqlite REQUIRED)22 find_package(Sqlite3 REQUIRED) 23 23 find_package(ZLIB REQUIRED) 24 24 … … 46 46 ${QUARTZCORE_LIBRARY} 47 47 ${SECURITY_LIBRARY} 48 ${SQLITE _LIBRARIES}48 ${SQLITE3_LIBRARIES} 49 49 ${SYSTEMCONFIGURATION_LIBRARY} 50 50 ${XML2_LIBRARY} … … 224 224 platform/cocoa/SearchPopupMenuCocoa.mm 225 225 platform/cocoa/SharedBufferCocoa.mm 226 platform/cocoa/SystemBattery.mm 226 227 platform/cocoa/SystemVersion.mm 227 228 platform/cocoa/TelephoneNumberDetectorCocoa.cpp … … 455 456 bridge/objc/WebScriptObjectPrivate.h 456 457 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 457 475 editing/cocoa/AutofillElements.h 458 476 editing/cocoa/DataDetection.h … … 468 486 loader/mac/LoaderNSURLExtras.h 469 487 488 Modules/webauthn/AuthenticatorAssertionResponse.h 489 Modules/webauthn/AuthenticatorResponse.h 490 Modules/webauthn/AuthenticatorAttestationResponse.h 491 492 Modules/webauthn/fido/Pin.h 493 470 494 page/mac/TextIndicatorWindow.h 471 495 page/mac/WebCoreFrameView.h … … 483 507 484 508 platform/PictureInPictureSupport.h 509 platform/PlatformContentFilter.h 485 510 486 511 platform/audio/cocoa/MediaSessionManagerCocoa.h … … 492 517 platform/cf/RunLoopObserver.h 493 518 519 platform/cocoa/NetworkExtensionContentFilter.h 494 520 platform/cocoa/PlatformView.h 495 521 platform/cocoa/PlaybackSessionInterface.h … … 499 525 platform/cocoa/ScrollSnapAnimatorState.h 500 526 platform/cocoa/SearchPopupMenuCocoa.h 527 platform/cocoa/SystemBattery.h 501 528 platform/cocoa/SystemVersion.h 502 529 platform/cocoa/VideoFullscreenChangeObserver.h … … 509 536 platform/gamepad/mac/HIDGamepad.h 510 537 platform/gamepad/mac/HIDGamepadProvider.h 538 539 platform/graphics/MIMETypeCache.h 511 540 512 541 platform/graphics/avfoundation/MediaPlaybackTargetCocoa.h … … 564 593 platform/mac/WebPlaybackControlsManager.h 565 594 595 platform/mediastream/RealtimeMediaSourceIdentifier.h 596 566 597 platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h 567 598 … … 582 613 platform/network/cocoa/CookieStorageObserver.h 583 614 platform/network/cocoa/CredentialCocoa.h 615 platform/network/cocoa/HTTPCookieAcceptPolicyCocoa.h 584 616 platform/network/cocoa/ProtectionSpaceCocoa.h 585 617 platform/network/cocoa/WebCoreNSURLSession.h -
TabularUnified trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h ¶
r255144 r255709 24 24 */ 25 25 26 #if TARGET_OS_IOS 27 26 28 #import <WebCore/AbstractPasteboard.h> 27 28 #if TARGET_OS_IOS29 29 30 30 struct CGSize; -
TabularUnified trunk/Source/WebKit/ChangeLog ¶
r255706 r255709 1 2020-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 1 10 2020-02-04 Chris Dumez <cdumez@apple.com> 2 11 -
TabularUnified trunk/Source/WebKit/PlatformMac.cmake ¶
r255214 r255709 15 15 set(MACOSX_FRAMEWORK_IDENTIFIER com.apple.WebKit) 16 16 17 list(APPEND WebKit_ LIBRARIES17 list(APPEND WebKit_PRIVATE_LIBRARIES 18 18 WebKitLegacy 19 19 ${APPLICATIONSERVICES_LIBRARY} … … 42 42 43 43 WebProcess/InjectedBundle/API/c/mac/WKBundlePageMac.mm 44 ) 45 46 list(APPEND WebKit_SOURCES 47 UIProcess/API/Cocoa/_WKContentWorld.mm 48 UIProcess/API/Cocoa/_WKResourceLoadStatisticsFirstParty.mm 49 UIProcess/API/Cocoa/_WKResourceLoadStatisticsThirdParty.mm 44 50 ) 45 51 … … 53 59 "${WEBKIT_DIR}/UIProcess/API/Cocoa" 54 60 "${WEBKIT_DIR}/UIProcess/API/mac" 61 "${WEBKIT_DIR}/UIProcess/API/ios" 55 62 "${WEBKIT_DIR}/UIProcess/Authentication/cocoa" 56 63 "${WEBKIT_DIR}/UIProcess/Cocoa" … … 151 158 152 159 list(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 153 177 NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in 154 178 … … 163 187 UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in 164 188 189 UIProcess/GPU/GPUProcessProxy.messages.in 190 165 191 UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in 166 192 … … 179 205 WebProcess/cocoa/VideoFullscreenManager.messages.in 180 206 207 WebProcess/GPU/GPUProcessConnection.messages.in 208 209 WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in 210 WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in 211 181 212 WebProcess/WebPage/ViewGestureGeometryCollector.messages.in 213 WebProcess/WebPage/ViewUpdateDispatcher.messages.in 182 214 183 215 WebProcess/WebPage/Cocoa/TextCheckingControllerProxy.messages.in … … 210 242 UIProcess/API/C/mac 211 243 UIProcess/API/cpp 244 UIProcess/API/ios 212 245 213 246 WebProcess/InjectedBundle/API/Cocoa … … 227 260 endif () 228 261 endforeach () 262 if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h) 263 file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingIOS.h "#import <WebKit/UIProcess/API/ios/WKWebViewPrivateForTestingIOS.h>") 264 endif () 265 if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h) 266 file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKWebViewPrivateForTestingMac.h "#import <WebKit/UIProcess/API/mac/WKWebViewPrivateForTestingMac.h>") 267 endif () 229 268 230 269 # FIXME: Forwarding headers should be complete copies of the header. -
TabularUnified trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm ¶
r255106 r255709 1023 1023 } 1024 1024 1025 void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo&, MonotonicTime) 1026 { 1027 } 1028 1025 1029 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS_FAMILY) 1026 1030 void WebPage::playbackTargetSelected(uint64_t contextId, const WebCore::MediaPlaybackTargetContext& targetContext) const -
TabularUnified trunk/Tools/ChangeLog ¶
r255708 r255709 1 2020-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 1 12 2020-02-04 Don Olmstead <don.olmstead@sony.com> 2 13 -
TabularUnified trunk/Tools/DumpRenderTree/PlatformMac.cmake ¶
r251855 r255709 26 26 cg 27 27 cf 28 cocoa 28 29 mac 29 30 mac/InternalHeaders/WebKit … … 75 76 list(APPEND DumpRenderTree_ObjCpp_SOURCES 76 77 DefaultPolicyDelegate.mm 78 cocoa/UIScriptControllerCocoa.mm 77 79 mac/AccessibilityCommonMac.mm 78 80 mac/AccessibilityControllerMac.mm -
TabularUnified trunk/Tools/MiniBrowser/mac/CMakeLists.txt ¶
r250591 r255709 19 19 ${CMAKE_SOURCE_DIR}/Source 20 20 ${FORWARDING_HEADERS_DIR} 21 ${FORWARDING_HEADERS_DIR}/WebKit 21 22 ${MINIBROWSER_DIR} 22 23 ) -
TabularUnified trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m ¶
r255543 r255709 127 127 _textFinder.findBarContainer = self; 128 128 129 #if __has_feature(objc_arc) 129 130 __weak WKWebView *weakWebView = _webView; 131 #else 132 WKWebView *weakWebView = _webView; 133 #endif 130 134 _textFinder.hideInterfaceCallback = ^{ 131 135 WKWebView *webView = weakWebView; -
TabularUnified trunk/Tools/WebKitTestRunner/PlatformMac.cmake ¶
r251831 r255709 23 23 ${FORWARDING_HEADERS_DIR}/JavaScriptCore 24 24 ${FORWARDING_HEADERS_DIR}/WebCore 25 ${FORWARDING_HEADERS_DIR}/WebKit 25 26 ${ICU_INCLUDE_DIRS} 26 27 ${WEBCORE_DIR}/testing/cocoa … … 86 87 87 88 ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/ClassMethodSwizzler.mm 89 ${WEBKIT_TESTRUNNER_SHARED_DIR}/cocoa/PlatformViewHelpers.mm 88 90 89 91 ${WEBKIT_TESTRUNNER_SHARED_DIR}/EventSerialization/mac/EventSerializerMac.mm
Note:
See TracChangeset
for help on using the changeset viewer.