Diff
Modified: trunk/ChangeLog (190254 => 190255)
--- trunk/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/ChangeLog 2015-09-25 22:04:32 UTC (rev 190255)
@@ -1,5 +1,14 @@
2015-09-25 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
[Win] Switch to CMake
https://bugs.webkit.org/show_bug.cgi?id=148111
Modified: trunk/Source/WTF/ChangeLog (190254 => 190255)
--- trunk/Source/WTF/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WTF/ChangeLog 2015-09-25 22:04:32 UTC (rev 190255)
@@ -1,5 +1,14 @@
2015-09-25 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
[Win] Switch to CMake
https://bugs.webkit.org/show_bug.cgi?id=148111
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (190254 => 190255)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -23,4 +23,5 @@
list(APPEND WTF_INCLUDE_DIRECTORIES
"${WTF_DIR}/icu"
+ "${WTF_DIR}/wtf/spi/darwin"
)
Modified: trunk/Source/WebCore/CMakeLists.txt (190254 => 190255)
--- trunk/Source/WebCore/CMakeLists.txt 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-09-25 22:04:32 UTC (rev 190255)
@@ -2913,12 +2913,6 @@
${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
Modified: trunk/Source/WebCore/ChangeLog (190254 => 190255)
--- trunk/Source/WebCore/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/ChangeLog 2015-09-25 22:04:32 UTC (rev 190255)
@@ -1,3 +1,16 @@
+2015-09-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
Scrolling a overflow: scroll region makes find overlay holes stick to the edge of the region
Modified: trunk/Source/WebCore/PlatformEfl.cmake (190254 => 190255)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -513,6 +513,12 @@
)
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}
Modified: trunk/Source/WebCore/PlatformGTK.cmake (190254 => 190255)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -909,6 +909,12 @@
# 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
Modified: trunk/Source/WebCore/PlatformMac.cmake (190254 => 190255)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -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/_javascript_Core"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
@@ -266,6 +276,7 @@
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 @@
Modules/notifications
Modules/webdatabase
+ Modules/indexeddb/legacy
+
bindings/generic
bindings/js
bindings/objc
@@ -631,6 +644,10 @@
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 @@
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
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (190254 => 190255)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2015-09-25 22:04:32 UTC (rev 190255)
@@ -29,9 +29,13 @@
#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 {
Modified: trunk/Source/WebKit/ChangeLog (190254 => 190255)
--- trunk/Source/WebKit/ChangeLog 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebKit/ChangeLog 2015-09-25 22:04:32 UTC (rev 190255)
@@ -1,5 +1,14 @@
2015-09-25 Alex Christensen <[email protected]>
+ 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 <[email protected]>
+
[Win] Switch to CMake
https://bugs.webkit.org/show_bug.cgi?id=148111
Modified: trunk/Source/WebKit/PlatformMac.cmake (190254 => 190255)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -17,8 +17,6 @@
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 @@
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 @@
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
)
Modified: trunk/Source/cmake/OptionsMac.cmake (190254 => 190255)
--- trunk/Source/cmake/OptionsMac.cmake 2015-09-25 22:01:21 UTC (rev 190254)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-09-25 22:04:32 UTC (rev 190255)
@@ -68,11 +68,13 @@
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_END()
+set(ENABLE_GRAPHICS_CONTEXT_3D ON)
set(ENABLE_WEBKIT ON)
set(ENABLE_WEBKIT2 ON)
set(USE_UDIS86 1)
