Clean up CMake build on Mac
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Sep 2015 22:04:32 +0000 (22:04 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Sep 2015 22:04:32 +0000 (22:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=149573

Reviewed by Chris Dumez.

.:

* Source/cmake/OptionsMac.cmake:

Source/WebCore:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* platform/graphics/DisplayRefreshMonitor.cpp:

Source/WebKit:

* PlatformMac.cmake:

Source/WTF:

* wtf/PlatformMac.cmake:

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

12 files changed:
ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformMac.cmake
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/cmake/OptionsMac.cmake

index b383a3e..5b4e038 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-09-25  Alex Christensen  <achristensen@webkit.org>
 
+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * Source/cmake/OptionsMac.cmake:
+
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
         [Win] Switch to CMake
         https://bugs.webkit.org/show_bug.cgi?id=148111
 
index c76abcf..a155395 100644 (file)
@@ -1,5 +1,14 @@
 2015-09-25  Alex Christensen  <achristensen@webkit.org>
 
+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * wtf/PlatformMac.cmake:
+
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
         [Win] Switch to CMake
         https://bugs.webkit.org/show_bug.cgi?id=148111
 
index f610619..24bea72 100644 (file)
@@ -23,4 +23,5 @@ list(APPEND WTF_SOURCES
 
 list(APPEND WTF_INCLUDE_DIRECTORIES
     "${WTF_DIR}/icu"
+    "${WTF_DIR}/wtf/spi/darwin"
 )
index 3f0eba6..131f644 100644 (file)
@@ -2913,12 +2913,6 @@ list(APPEND WebCore_CSS_VALUE_KEYWORDS
     ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
 )
 
-if (ENABLE_SMOOTH_SCROLLING)
-    list(APPEND WebCore_SOURCES
-        platform/ScrollAnimatorNone.cpp
-    )
-endif ()
-
 if (ENABLE_WEBGL)
     list(APPEND WebCore_SOURCES
         html/canvas/ANGLEInstancedArrays.cpp
index e653844..2f5f2ab 100644 (file)
@@ -1,3 +1,16 @@
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformMac.cmake:
+        * platform/graphics/DisplayRefreshMonitor.cpp:
+
 2015-09-25  Tim Horton  <timothy_horton@apple.com>
 
         Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
index 28385f9..9cc1157 100644 (file)
@@ -513,6 +513,12 @@ if (ENABLE_ACCESSIBILITY)
     )
 endif ()
 
+if (ENABLE_SMOOTH_SCROLLING)
+    list(APPEND WebCore_SOURCES
+        platform/ScrollAnimatorNone.cpp
+    )
+endif ()
+
 if (ENABLE_SPEECH_SYNTHESIS)
     list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
         ${ESPEAK_INCLUDE_DIRS}
index 6943b6d..5b6e1e2 100644 (file)
@@ -909,6 +909,12 @@ list(REMOVE_ITEM GObjectDOMBindings_GIR_HEADERS
 # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
 set(GObjectDOMBindings_GIR_HEADERS ${GObjectDOMBindings_GIR_HEADERS} PARENT_SCOPE)
 
+if (ENABLE_SMOOTH_SCROLLING)
+    list(APPEND WebCore_SOURCES
+        platform/ScrollAnimatorNone.cpp
+    )
+endif ()
+
 if (ENABLE_SUBTLE_CRYPTO)
     list(APPEND WebCore_SOURCES
         crypto/CryptoAlgorithm.cpp
index b89c820..c7cf619 100644 (file)
@@ -1,6 +1,16 @@
 find_library(QUARTZ_FRAMEWORK Quartz)
 add_definitions(-iframework ${QUARTZ_FRAMEWORK}/Frameworks)
 
+find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
+if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
+    list(APPEND WebCore_LIBRARIES ${DATADETECTORSCORE_FRAMEWORK})
+endif ()
+
+find_library(LOOKUP_FRAMEWORK Lookup HINTS /System/Library/PrivateFrameworks)
+if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
+    list(APPEND WebCore_LIBRARIES ${LOOKUP_FRAMEWORK})
+endif ()
+
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
@@ -266,6 +276,7 @@ list(APPEND WebCore_SOURCES
     platform/cocoa/NetworkExtensionContentFilter.mm
     platform/cocoa/ParentalControlsContentFilter.mm
     platform/cocoa/ScrollController.mm
+    platform/cocoa/ScrollSnapAnimatorState.mm
     platform/cocoa/SystemVersion.mm
     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
     platform/cocoa/ThemeCocoa.cpp
@@ -516,6 +527,8 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     Modules/notifications
     Modules/webdatabase
 
+    Modules/indexeddb/legacy
+
     bindings/generic
     bindings/js
     bindings/objc
@@ -631,6 +644,10 @@ set(WebCore_FORWARDING_HEADERS_FILES
     rendering/style/RenderStyleConstants.h
 )
 
+list(APPEND WebCore_IDL_FILES
+    Modules/plugins/QuickTimePluginReplacement.idl
+)
+
 set(OBJC_BINDINGS_IDL_FILES
     dom/EventListener.idl
     ${WebCore_NON_SVG_IDL_FILES}
@@ -693,6 +710,7 @@ GENERATE_BINDINGS(WebCore_SOURCES
 list(APPEND WebCore_SOURCES
     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMAttr.mm
     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBeforeLoadEvent.mm
+    ${DERIVED_SOURCES_WEBCORE_DIR}/DOMBlob.mm
     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCDATASection.mm
     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMCharacterData.mm
     ${DERIVED_SOURCES_WEBCORE_DIR}/DOMComment.mm
index 8fe9ae1..90d8015 100644 (file)
 #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
 
 #include "DisplayRefreshMonitorClient.h"
+#include "DisplayRefreshMonitorManager.h"
+
+#if PLATFORM(IOS)
 #include "DisplayRefreshMonitorIOS.h"
+#else
 #include "DisplayRefreshMonitorMac.h"
-#include "DisplayRefreshMonitorManager.h"
+#endif
 
 namespace WebCore {
 
index 53e4fe6..88dc6a5 100644 (file)
@@ -1,5 +1,14 @@
 2015-09-25  Alex Christensen  <achristensen@webkit.org>
 
+        Clean up CMake build on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=149573
+
+        Reviewed by Chris Dumez.
+
+        * PlatformMac.cmake:
+
+2015-09-25  Alex Christensen  <achristensen@webkit.org>
+
         [Win] Switch to CMake
         https://bugs.webkit.org/show_bug.cgi?id=148111
 
index 8215df9..c84378e 100644 (file)
@@ -17,8 +17,6 @@ find_library(XML2_LIBRARY XML2)
 find_package(ZLIB REQUIRED)
 
 add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
-find_library(PDFKIT_LIBRARY PDFKit HINTS ${QUARTZ_LIBRARY}/Frameworks)
-find_library(QUICKLOOKUI_LIBRARY QuickLookUI HINTS ${QUARTZ_LIBRARY}/Frameworks)
 
 if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
 set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
@@ -40,7 +38,6 @@ list(APPEND WebKit_LIBRARIES
     PRIVATE ${IOKIT_LIBRARY}
     PRIVATE ${IOSURFACE_LIBRARY}
     PRIVATE ${OPENGL_LIBRARY}
-    PRIVATE ${PDFKIT_LIBRARY}
     PRIVATE ${QUARTZ_LIBRARY}
     PRIVATE ${QUARTZCORE_LIBRARY}
     PRIVATE ${SECURITY_LIBRARY}
@@ -408,13 +405,8 @@ add_custom_command(
     COMMAND mig -I.. -sheader WebKitPluginClientServer.h WebKitPluginClient.defs
     VERBATIM)
 list(APPEND WebKit_SOURCES
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyServer.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentReplyUser.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentServer.c
     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginAgentUser.c
     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientServer.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginClientUser.c
-    ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostServer.c
     ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/WebKitPluginHostUser.c
 )
 
index 98936a6..e181dc0 100644 (file)
@@ -68,11 +68,13 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING PRIVATE
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_macosx PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ICONDATABASE_macosx PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_1080 PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_1090 PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS_macosx_101000 PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SMOOTH_SCROLLING PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDIE_UI PRIVATE ON)
@@ -227,6 +229,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
 
 WEBKIT_OPTION_END()
 
+set(ENABLE_GRAPHICS_CONTEXT_3D ON)
 set(ENABLE_WEBKIT ON)
 set(ENABLE_WEBKIT2 ON)
 set(USE_UDIS86 1)