Title: [210980] trunk/Source/WebKit2
- Revision
- 210980
- Author
- [email protected]
- Date
- 2017-01-20 13:50:26 -0800 (Fri, 20 Jan 2017)
Log Message
Fix Mac CMake build.
* CMakeLists.txt:
* PlatformMac.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (210979 => 210980)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-01-20 21:50:26 UTC (rev 210980)
@@ -722,6 +722,9 @@
endif ()
endmacro()
+set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+)
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
@@ -747,7 +750,7 @@
OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp
MAIN_DEPENDENCY ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
DEPENDS ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
- COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
+ COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS} --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
VERBATIM)
list(APPEND WebKit2_HEADERS
Modified: trunk/Source/WebKit2/ChangeLog (210979 => 210980)
--- trunk/Source/WebKit2/ChangeLog 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-20 21:50:26 UTC (rev 210980)
@@ -1,3 +1,10 @@
+2017-01-20 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2017-01-20 Antoine Quint <[email protected]>
Web Animations should be off by default and enabled as an experimental feature
Modified: trunk/Source/WebKit2/PlatformMac.cmake (210979 => 210980)
--- trunk/Source/WebKit2/PlatformMac.cmake 2017-01-20 21:35:09 UTC (rev 210979)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-01-20 21:50:26 UTC (rev 210980)
@@ -157,11 +157,16 @@
Shared/mac/WebMemorySampler.mac.mm
UIProcess/HighPerformanceGraphicsUsageSampler.cpp
+ UIProcess/PerActivityStateCPUUsageSampler.cpp
UIProcess/WebContextMenuListenerProxy.cpp
UIProcess/WebResourceLoadStatisticsStore.cpp
UIProcess/Automation/WebAutomationSession.cpp
+ UIProcess/Automation/cocoa/WebAutomationSessionCocoa.mm
+
+ UIProcess/Automation/mac/WebAutomationSessionMac.mm
+
UIProcess/API/APIUserScript.cpp
UIProcess/API/APIUserStyleSheet.cpp
UIProcess/API/APIWebsiteDataRecord.cpp
@@ -243,7 +248,6 @@
UIProcess/Cocoa/ViewGestureController.cpp
UIProcess/Cocoa/WKReloadFrameErrorRecoveryAttempter.mm
UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
- UIProcess/Cocoa/WebAutomationSessionCocoa.mm
UIProcess/Cocoa/WebPageProxyCocoa.mm
UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
UIProcess/Cocoa/WebProcessPoolCocoa.mm
@@ -712,6 +716,10 @@
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/${_file} "#import <WebKitLegacy/${_file}>")
endforeach ()
+list(APPEND WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
+ --platform=macOS
+)
+
# FIXME: These should not be necessary.
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WKImageCG.h "#import <WebKit2/Shared/API/c/cg/WKImageCG.h>")
file(WRITE ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
