Diff
Modified: trunk/ChangeLog (225289 => 225290)
--- trunk/ChangeLog 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/ChangeLog 2017-11-29 21:31:07 UTC (rev 225290)
@@ -1,3 +1,9 @@
+2017-11-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * Source/cmake/OptionsMac.cmake:
+
2017-11-28 Michael Catanzaro <mcatanz...@igalia.com>
REGRESSION(r225098): [WPE] Some features have changed of value (70 new failures)
Modified: trunk/Source/_javascript_Core/ChangeLog (225289 => 225290)
--- trunk/Source/_javascript_Core/ChangeLog 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-11-29 21:31:07 UTC (rev 225290)
@@ -1,3 +1,9 @@
+2017-11-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * PlatformMac.cmake:
+
2017-11-29 Stanislav Ocovaj <stanislav.oco...@rt-rk.com>
[MIPS][JSC] Implement MacroAssembler::probe support on MIPS
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (225289 => 225290)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
@@ -12,6 +12,7 @@
list(APPEND _javascript_Core_INCLUDE_DIRECTORIES
${_javascript_CORE_DIR}/disassembler/udis86
${_javascript_CORE_DIR}/icu
+ ${_javascript_CORE_DIR}/inspector/cocoa
${_javascript_CORE_DIR}/inspector/remote/cocoa
)
Modified: trunk/Source/WebCore/ChangeLog (225289 => 225290)
--- trunk/Source/WebCore/ChangeLog 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/ChangeLog 2017-11-29 21:31:07 UTC (rev 225290)
@@ -1,3 +1,9 @@
+2017-11-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * PlatformMac.cmake:
+
2017-11-29 Simon Fraser <simon.fra...@apple.com>
REGRESSION (r213590): Scrolling to anchors broken in web views when content loaded via HTML string
Modified: trunk/Source/WebCore/PAL/ChangeLog (225289 => 225290)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-11-29 21:31:07 UTC (rev 225290)
@@ -1,3 +1,9 @@
+2017-11-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * pal/PlatformMac.cmake:
+
2017-11-28 Brent Fulgham <bfulg...@apple.com>
Adopt updated NSKeyed[Un]Archiver API when available
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (225289 => 225290)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
@@ -3,6 +3,7 @@
cf/CoreMediaSoftLink.cpp
+ cocoa/FileSizeFormatterCocoa.mm
cocoa/LoggingCocoa.mm
crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
@@ -22,5 +23,6 @@
list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
"${PAL_DIR}/pal/cf"
"${PAL_DIR}/pal/spi/cf"
+ "${PAL_DIR}/pal/spi/cocoa"
"${PAL_DIR}/pal/spi/mac"
)
Modified: trunk/Source/WebCore/PlatformMac.cmake (225289 => 225290)
--- trunk/Source/WebCore/PlatformMac.cmake 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebCore/PlatformMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
@@ -90,6 +90,7 @@
"${WEBCORE_DIR}/ForwardingHeaders/replay"
"${WEBCORE_DIR}/ForwardingHeaders/runtime"
"${WEBCORE_DIR}/ForwardingHeaders/yarr"
+ "${WEBCORE_DIR}/html/shadow/cocoa"
"${WEBCORE_DIR}/icu"
"${WEBCORE_DIR}/loader/archive/cf"
"${WEBCORE_DIR}/loader/cf"
@@ -293,7 +294,6 @@
platform/graphics/cg/IOSurfacePool.cpp
platform/graphics/cg/ImageBufferCG.cpp
platform/graphics/cg/ImageBufferDataCG.cpp
- platform/graphics/cg/ImageCG.cpp
platform/graphics/cg/ImageDecoderCG.cpp
platform/graphics/cg/ImageSourceCGMac.mm
platform/graphics/cg/IntPointCG.cpp
@@ -470,6 +470,8 @@
rendering/RenderThemeCocoa.mm
rendering/RenderThemeMac.mm
rendering/TextAutoSizing.cpp
+
+ xml/SoftLinkLibxslt.cpp
)
# FIXME: We do not need everything from all of these directories.
@@ -526,6 +528,8 @@
html/parser
html/shadow
+ inspector/agents
+
loader/appcache
loader/archive
loader/cache
Modified: trunk/Source/WebKit/ChangeLog (225289 => 225290)
--- trunk/Source/WebKit/ChangeLog 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebKit/ChangeLog 2017-11-29 21:31:07 UTC (rev 225290)
@@ -1,3 +1,9 @@
+2017-11-29 Alex Christensen <achristen...@webkit.org>
+
+ Fix Mac CMake build.
+
+ * PlatformMac.cmake:
+
2017-11-29 Chris Dumez <cdu...@apple.com>
StorageToWebProcessConnection & WebSWServerToContextConnection should use the same underlying IPC::Connection
Modified: trunk/Source/WebKit/PlatformMac.cmake (225289 => 225290)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
@@ -176,6 +176,7 @@
UIProcess/Automation/mac/WebAutomationSessionMac.mm
+ UIProcess/API/APIAttachment.cpp
UIProcess/API/APIUserScript.cpp
UIProcess/API/APIUserStyleSheet.cpp
UIProcess/API/APIWebsiteDataRecord.cpp
@@ -302,6 +303,7 @@
UIProcess/mac/WKFullKeyboardAccessWatcher.mm
UIProcess/mac/WKFullScreenWindowController.mm
UIProcess/mac/WKImmediateActionController.mm
+ UIProcess/mac/WKInspectorViewController.mm
UIProcess/mac/WKPrintingView.mm
UIProcess/mac/WKSharingServicePickerDelegate.mm
UIProcess/mac/WKTextFinderClient.mm
@@ -508,6 +510,7 @@
Shared/API/c/cf
Shared/API/c/mac
+ UIProcess
UIProcess/Cocoa
UIProcess/API/C
@@ -794,4 +797,4 @@
ibtool --compile ${WebKit_XPC_SERVICE_DIR}/com.apple.WebKit.WebContent.xpc/Contents/Resources/WebContentProcess.nib ${WEBKIT_DIR}/Resources/WebContentProcess.xib
VERBATIM)
add_dependencies(WebKit WebContentProcessNib)
-endfunction()
\ No newline at end of file
+endfunction()
Modified: trunk/Source/cmake/OptionsMac.cmake (225289 => 225290)
--- trunk/Source/cmake/OptionsMac.cmake 2017-11-29 21:11:04 UTC (rev 225289)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-11-29 21:31:07 UTC (rev 225290)
@@ -5,7 +5,7 @@
# we need a value different from the default defined in WebKitFeatures.cmake.
# FIXME: Many of these defaults differ from the XCode build.
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALTERNATIVE_PRESENTATION_BUTTON_ELEMENT ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ALTERNATIVE_PRESENTATION_BUTTON_ELEMENT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ATTACHMENT_ELEMENT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ASYNC_SCROLLING PRIVATE ON)
