Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit b9dbb2f

Browse files
author
[email protected]
committed
Update Mac CMake build
.: * Source/cmake/OptionsMac.cmake: Source/JavaScriptCore: * PlatformMac.cmake: Source/WebCore: * PlatformMac.cmake: Source/WebKit: * PlatformMac.cmake: Source/WebKitLegacy: * PlatformMac.cmake: Tools: * DumpRenderTree/PlatformMac.cmake: * WebKitTestRunner/PlatformMac.cmake: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f7b17c1 commit b9dbb2f

File tree

13 files changed

+113
-100
lines changed

13 files changed

+113
-100
lines changed

‎ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-07-02 Alex Christensen <[email protected]>
2+
3+
Update Mac CMake build
4+
5+
* Source/cmake/OptionsMac.cmake:
6+
17
2020-07-01 Don Olmstead <[email protected]>
28

39
[CMake] Add WOFF2 targets

‎Source/JavaScriptCore/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-07-02 Alex Christensen <[email protected]>
2+
3+
Update Mac CMake build
4+
5+
* PlatformMac.cmake:
6+
17
2020-07-02 Yusuke Suzuki <[email protected]>
28

39
[JSC] Configure option-offered numberingSystem in Intl.NumberFormat through locale

‎Source/JavaScriptCore/PlatformMac.cmake

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES
1010
)
1111

1212
list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
13+
${DERIVED_SOURCES_DIR}
1314
${JAVASCRIPTCORE_DIR}/disassembler/udis86
1415
${JAVASCRIPTCORE_DIR}/inspector/cocoa
1516
${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
@@ -36,21 +37,21 @@ list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
3637
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")
3738

3839
# FIXME: Make including these files consistent in the source so these forwarding headers are not needed.
39-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h)
40-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
40+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h)
41+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/AugmentableInspectorControllerClient.h "#include \"inspector/augmentable/AugmentableInspectorControllerClient.h\"")
4142
endif ()
42-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h)
43-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
43+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorFrontendRouter.h)
44+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorFrontendRouter.h "#include \"inspector/InspectorFrontendRouter.h\"")
4445
endif ()
45-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h)
46-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
46+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h)
47+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.h "#include \"inspector/InspectorBackendDispatcher.h\"")
4748
endif ()
48-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h)
49-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
49+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorBackendDispatchers.h)
50+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorBackendDispatchers.h "#include \"inspector/InspectorBackendDispatchers.h\"")
5051
endif ()
51-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h)
52-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
52+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorFrontendDispatchers.h)
53+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorFrontendDispatchers.h "#include \"inspector/InspectorFrontendDispatchers.h\"")
5354
endif ()
54-
if (NOT EXISTS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h)
55-
file(WRITE ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
55+
if (NOT EXISTS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorProtocolObjects.h)
56+
file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/InspectorProtocolObjects.h "#include \"inspector/InspectorProtocolObjects.h\"")
5657
endif ()

‎Source/WebCore/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-07-02 Alex Christensen <[email protected]>
2+
3+
Update Mac CMake build
4+
5+
* PlatformMac.cmake:
6+
17
2020-07-02 Said Abou-Hallawa <[email protected]>
28

39
MIMETypeRegistry::getExtensionsForMIMEType() needs to handle wildcard MIME types

‎Source/WebCore/PlatformMac.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ list(APPEND WebCore_SOURCES
196196
platform/audio/mac/AudioDestinationMac.cpp
197197
platform/audio/mac/AudioFileReaderMac.cpp
198198
platform/audio/mac/AudioHardwareListenerMac.cpp
199-
platform/audio/mac/AudioSessionMac.cpp
200199
platform/audio/mac/CARingBuffer.cpp
201200
platform/audio/mac/FFTFrameMac.cpp
202201

@@ -357,10 +356,7 @@ list(APPEND WebCore_SOURCES
357356
platform/graphics/opentype/OpenTypeCG.cpp
358357
platform/graphics/opentype/OpenTypeMathData.cpp
359358

360-
platform/mac/BlacklistUpdater.mm
361359
platform/mac/CursorMac.mm
362-
platform/mac/DragDataMac.mm
363-
platform/mac/DragImageMac.mm
364360
platform/mac/KeyEventMac.mm
365361
platform/mac/LocalCurrentGraphicsContextMac.mm
366362
platform/mac/LoggingMac.mm
@@ -372,7 +368,6 @@ list(APPEND WebCore_SOURCES
372368
platform/mac/PlatformPasteboardMac.mm
373369
platform/mac/PlatformScreenMac.mm
374370
platform/mac/PlatformSpeechSynthesizerMac.mm
375-
platform/mac/PluginBlacklist.mm
376371
platform/mac/PowerObserverMac.cpp
377372
platform/mac/PublicSuffixMac.mm
378373
platform/mac/RemoteCommandListenerMac.mm
@@ -392,7 +387,6 @@ list(APPEND WebCore_SOURCES
392387
platform/mac/WebCoreFullScreenWindow.mm
393388
platform/mac/WebCoreNSURLExtras.mm
394389
platform/mac/WebCoreObjCExtras.mm
395-
platform/mac/WebGLBlacklist.mm
396390
platform/mac/WebNSAttributedStringExtras.mm
397391
platform/mac/WidgetMac.mm
398392

@@ -519,7 +513,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
519513
platform/cocoa/LocalCurrentGraphicsContext.h
520514
platform/cocoa/NetworkExtensionContentFilter.h
521515
platform/cocoa/PlatformView.h
522-
platform/cocoa/PlaybackSessionInterface.h
523516
platform/cocoa/PlaybackSessionModel.h
524517
platform/cocoa/PlaybackSessionModelMediaElement.h
525518
platform/cocoa/ScrollController.h
@@ -581,7 +574,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
581574
platform/mac/PasteboardWriter.h
582575
platform/mac/PlatformEventFactoryMac.h
583576
platform/mac/PlaybackSessionInterfaceMac.h
584-
platform/mac/PluginBlacklist.h
585577
platform/mac/ScrollbarThemeMac.h
586578
platform/mac/StringUtilities.h
587579
platform/mac/VideoFullscreenInterfaceMac.h
@@ -591,7 +583,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
591583
platform/mac/WebCoreNSURLExtras.h
592584
platform/mac/WebCoreObjCExtras.h
593585
platform/mac/WebCoreView.h
594-
platform/mac/WebGLBlacklist.h
595586
platform/mac/WebNSAttributedStringExtras.h
596587
platform/mac/WebPlaybackControlsManager.h
597588

@@ -633,6 +624,10 @@ list(APPEND WebCore_IDL_FILES
633624
Modules/applepay/ApplePayError.idl
634625
Modules/applepay/ApplePayErrorCode.idl
635626
Modules/applepay/ApplePayErrorContactField.idl
627+
Modules/applepay/ApplePayInstallmentItem.idl
628+
Modules/applepay/ApplePayInstallmentItemType.idl
629+
Modules/applepay/ApplePayInstallmentConfiguration.idl
630+
Modules/applepay/ApplePayInstallmentRetailChannel.idl
636631
Modules/applepay/ApplePayLineItem.idl
637632
Modules/applepay/ApplePayMerchantCapability.idl
638633
Modules/applepay/ApplePayPayment.idl
@@ -648,6 +643,11 @@ list(APPEND WebCore_IDL_FILES
648643
Modules/applepay/ApplePayRequestBase.idl
649644
Modules/applepay/ApplePaySession.idl
650645
Modules/applepay/ApplePaySessionError.idl
646+
Modules/applepay/ApplePaySetup.idl
647+
Modules/applepay/ApplePaySetupConfiguration.idl
648+
Modules/applepay/ApplePaySetupFeature.idl
649+
Modules/applepay/ApplePaySetupFeatureState.idl
650+
Modules/applepay/ApplePaySetupFeatureType.idl
651651
Modules/applepay/ApplePayShippingContactSelectedEvent.idl
652652
Modules/applepay/ApplePayShippingContactUpdate.idl
653653
Modules/applepay/ApplePayShippingMethod.idl

‎Source/WebKit/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-07-02 Alex Christensen <[email protected]>
2+
3+
Update Mac CMake build
4+
5+
* PlatformMac.cmake:
6+
17
2020-07-02 Kate Cheney <[email protected]>
28

39
Custom URL schemes should be treated as app-bound

‎Source/WebKit/PlatformMac.cmake

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -163,23 +163,7 @@ set(WebKit_FORWARDING_HEADERS_FILES
163163
)
164164

165165
list(APPEND WebKit_MESSAGES_IN_FILES
166-
GPUProcess/GPUConnectionToWebProcess.messages.in
167-
GPUProcess/GPUProcess.messages.in
168-
169-
GPUProcess/media/RemoteAudioDestinationManager.messages.in
170-
GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in
171-
GPUProcess/media/RemoteMediaPlayerProxy.messages.in
172-
GPUProcess/media/RemoteMediaResourceManager.messages.in
173-
174-
GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
175-
GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
176-
GPUProcess/webrtc/RemoteAudioMediaStreamTrackRendererManager.messages.in
177-
GPUProcess/webrtc/RemoteMediaRecorderManager.messages.in
178-
GPUProcess/webrtc/RemoteSampleBufferDisplayLayer.messages.in
179-
GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
180-
GPUProcess/webrtc/RemoteMediaRecorder.messages.in
181-
GPUProcess/webrtc/RemoteAudioMediaStreamTrackRenderer.messages.in
182-
GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager.messages.in
166+
GPUProcess/media/ios/RemoteMediaSessionHelperProxy.messages.in
183167

184168
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager.messages.in
185169

@@ -193,8 +177,6 @@ list(APPEND WebKit_MESSAGES_IN_FILES
193177
UIProcess/Cocoa/UserMediaCaptureManagerProxy.messages.in
194178
UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in
195179

196-
UIProcess/GPU/GPUProcessProxy.messages.in
197-
198180
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.messages.in
199181

200182
UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.messages.in
@@ -212,10 +194,7 @@ list(APPEND WebKit_MESSAGES_IN_FILES
212194
WebProcess/cocoa/UserMediaCaptureManager.messages.in
213195
WebProcess/cocoa/VideoFullscreenManager.messages.in
214196

215-
WebProcess/GPU/GPUProcessConnection.messages.in
216-
217-
WebProcess/GPU/webrtc/LibWebRTCCodecs.messages.in
218-
WebProcess/GPU/webrtc/SampleBufferDisplayLayer.messages.in
197+
WebProcess/GPU/media/ios/RemoteMediaSessionHelper.messages.in
219198

220199
WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
221200
WebProcess/WebPage/ViewUpdateDispatcher.messages.in

‎Source/WebKitLegacy/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-07-02 Alex Christensen <[email protected]>
2+
3+
Update Mac CMake build
4+
5+
* PlatformMac.cmake:
6+
17
2020-06-17 Darryl Pogue <[email protected]>
28

39
IndexedDB: Support IDBFactory databases method

‎Source/WebKitLegacy/PlatformMac.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacy
680680
FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES}
681681
FLATTENED
682682
)
683-
add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
684683

685684
set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)
686685

‎Source/cmake/OptionsMac.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,5 @@ set(WebCore_LIBRARY_TYPE SHARED)
117117
set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
118118

119119
find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc)
120+
find_package(LibXml2 2.8.0 REQUIRED)
121+
find_package(LibXslt 1.1.7 REQUIRED)

0 commit comments

Comments
 (0)