Fix Mac CMake build.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Nov 2017 21:31:07 +0000 (21:31 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Nov 2017 21:31:07 +0000 (21:31 +0000)
.:

* Source/cmake/OptionsMac.cmake:

Source/JavaScriptCore:

* PlatformMac.cmake:

Source/WebCore:

* PlatformMac.cmake:

Source/WebCore/PAL:

* pal/PlatformMac.cmake:

Source/WebKit:

* PlatformMac.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/PlatformMac.cmake
Source/WebCore/PlatformMac.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/cmake/OptionsMac.cmake

index 736eb1d..25fa479 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * Source/cmake/OptionsMac.cmake:
+
 2017-11-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         REGRESSION(r225098): [WPE] Some features have changed of value (70 new failures)
index 7b17e8a..8a23836 100755 (executable)
@@ -1,3 +1,9 @@
+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
 2017-11-29  Stanislav Ocovaj  <stanislav.ocovaj@rt-rk.com>
 
         [MIPS][JSC] Implement MacroAssembler::probe support on MIPS
index ed805fc..297636b 100644 (file)
@@ -12,6 +12,7 @@ list(APPEND JavaScriptCore_UNIFIED_SOURCE_LIST_FILES
 list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
     ${JAVASCRIPTCORE_DIR}/icu
+    ${JAVASCRIPTCORE_DIR}/inspector/cocoa
     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
 )
 
index be756e1..ad24bf3 100644 (file)
@@ -1,3 +1,9 @@
+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
 2017-11-29  Simon Fraser  <simon.fraser@apple.com>
 
         REGRESSION (r213590): Scrolling to anchors broken in web views when content loaded via HTML string
index 52fc72d..fbefa71 100644 (file)
@@ -1,3 +1,9 @@
+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * pal/PlatformMac.cmake:
+
 2017-11-28  Brent Fulgham  <bfulgham@apple.com>
 
         Adopt updated NSKeyed[Un]Archiver API when available
index 6d34a0a..70dd243 100644 (file)
@@ -3,6 +3,7 @@ list(APPEND PAL_SOURCES
 
     cf/CoreMediaSoftLink.cpp
 
+    cocoa/FileSizeFormatterCocoa.mm
     cocoa/LoggingCocoa.mm
 
     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
@@ -22,5 +23,6 @@ list(APPEND PAL_SOURCES
 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"
 )
index c3d5616..cda98a4 100644 (file)
@@ -90,6 +90,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${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 @@ list(APPEND WebCore_SOURCES
     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 @@ list(APPEND WebCore_SOURCES
     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 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     html/parser
     html/shadow
 
+    inspector/agents
+
     loader/appcache
     loader/archive
     loader/cache
index 421c353..3b2cec3 100644 (file)
@@ -1,3 +1,9 @@
+2017-11-29  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Mac CMake build.
+
+        * PlatformMac.cmake:
+
 2017-11-29  Chris Dumez  <cdumez@apple.com>
 
         StorageToWebProcessConnection & WebSWServerToContextConnection should use the same underlying IPC::Connection
index 789f384..0d2d353 100644 (file)
@@ -176,6 +176,7 @@ list(APPEND WebKit_SOURCES
 
     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 @@ list(APPEND WebKit_SOURCES
     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 @@ set(WebKit_FORWARDING_HEADERS_DIRECTORIES
     Shared/API/c/cf
     Shared/API/c/mac
 
+    UIProcess
     UIProcess/Cocoa
 
     UIProcess/API/C
@@ -794,4 +797,4 @@ function(WEBKIT_DEFINE_XPC_SERVICES)
         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()
index 9cdb2c1..333f8bd 100644 (file)
@@ -5,7 +5,7 @@ WEBKIT_OPTION_BEGIN()
 # 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)