Progress towards CMake on Mac

https://bugs.webkit.org/show_bug.cgi?id=150466

Reviewed by Chris Dumez.

Source/WebCore:

* PlatformMac.cmake:
* crypto/mac/SerializedCryptoKeyWrapMac.mm:
(WebCore::createAndStoreMasterKey):
* page/mac/WheelEventDeltaFilterMac.mm:
* platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h:

Source/WebKit2:

* CMakeLists.txt:
* PlatformMac.cmake:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b52b0a1..97840d1 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2015-10-22  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150466
+
+        Reviewed by Chris Dumez.
+
+        * PlatformMac.cmake:
+        * crypto/mac/SerializedCryptoKeyWrapMac.mm:
+        (WebCore::createAndStoreMasterKey):
+        * page/mac/WheelEventDeltaFilterMac.mm:
+        * platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h:
+
 2015-10-22  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI

diff --git a/Source/WebCore/PlatformMac.cmake b/Source/WebCore/PlatformMac.cmake
index bc1a9a9..eef1b49 100644 (file)
--- a/Source/WebCore/PlatformMac.cmake
+++ b/Source/WebCore/PlatformMac.cmake
@@ -99,8 +99,8 @@ list(APPEND WebCore_SOURCES
 )
 
 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
-    "/usr/include/libxslt"
-    "/usr/include/libxml2"
+    "${CMAKE_OSX_SYSROOT}/usr/include/libxslt"
+    "${CMAKE_OSX_SYSROOT}/usr/include/libxml2"
 )
 
 list(APPEND WebCore_SOURCES
@@ -233,6 +233,7 @@ list(APPEND WebCore_SOURCES
     page/mac/SettingsMac.mm
     page/mac/TextIndicatorWindow.mm
     page/mac/UserAgentMac.mm
+    page/mac/WheelEventDeltaFilterMac.mm
 
     page/scrolling/AsyncScrollingCoordinator.cpp
 
@@ -280,6 +281,7 @@ list(APPEND WebCore_SOURCES
     platform/cocoa/ParentalControlsContentFilter.mm
     platform/cocoa/ScrollController.mm
     platform/cocoa/ScrollSnapAnimatorState.mm
+    platform/cocoa/SearchPopupMenuCocoa.mm
     platform/cocoa/SystemVersion.mm
     platform/cocoa/TelephoneNumberDetectorCocoa.cpp
     platform/cocoa/ThemeCocoa.cpp
@@ -559,6 +561,8 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
 
     platform/animation
     platform/audio
+    platform/cf
+    platform/cocoa
     platform/graphics
     platform/mac
     platform/mediastream
@@ -568,6 +572,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORIES
     platform/text
 
     platform/graphics/ca
+    platform/graphics/cocoa
     platform/graphics/cg
     platform/graphics/filters
     platform/graphics/mac

diff --git a/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm b/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm
index 3183b8c..a7d36c8 100644 (file)
--- a/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm
+++ b/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm
@@ -93,7 +93,7 @@ static bool createAndStoreMasterKey(Vector<uint8_t>& masterKeyData)
     status = SecAccessCreate((CFStringRef)localizedItemName, nullptr, &accessRef);
     if (status) {
         WTFLogAlways("Cannot create a security access object for storing WebCrypto master key, error %d", (int)status);
-        return nullptr;
+        return false;
     }
     RetainPtr<SecAccessRef> access = adoptCF(accessRef);
 
@@ -104,14 +104,14 @@ static bool createAndStoreMasterKey(Vector<uint8_t>& masterKeyData)
     status = SecTrustedApplicationCreateFromPath(0, &trustedAppRef);
     if (status) {
         WTFLogAlways("Cannot create a trusted application object for storing WebCrypto master key, error %d", (int)status);
-        return nullptr;
+        return false;
     }
     RetainPtr<SecTrustedApplicationRef> trustedApp = adoptCF(trustedAppRef);
 
     status = SecACLSetContents(acl, (CFArrayRef)@[ (id)trustedApp.get() ], (CFStringRef)localizedItemName, kSecKeychainPromptRequirePassphase);
     if (status) {
         WTFLogAlways("Cannot set ACL for WebCrypto master key, error %d", (int)status);
-        return nullptr;
+        return false;
     }
 #endif
 
@@ -134,7 +134,7 @@ static bool createAndStoreMasterKey(Vector<uint8_t>& masterKeyData)
     status = SecItemAdd((CFDictionaryRef)attributes, nullptr);
     if (status) {
         WTFLogAlways("Cannot store WebCrypto master key, error %d", (int)status);
-        return nullptr;
+        return false;
     }
     return true;
 }

diff --git a/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm b/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm
index 1d1f5ed..654f21a 100644 (file)
--- a/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm
+++ b/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm
@@ -23,9 +23,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
-#include "config.h"
 #include "WheelEventDeltaFilterMac.h"
 #include "FloatPoint.h"
 

diff --git a/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h b/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h
index ebb5cdd..0dca331 100644 (file)
--- a/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h
+++ b/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h
@@ -22,6 +22,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
+#ifndef NSImmediateActionGestureRecognizerSPI_h
+#define NSImmediateActionGestureRecognizerSPI_h
 
 #if  __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 
@@ -60,3 +62,5 @@
 @end
 
 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+
+#endif

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index af6458d..b34b6e4 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -93,12 +93,12 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/html"
     "${WEBCORE_DIR}/html/shadow"
     "${WEBCORE_DIR}/html/track"
+    "${WEBCORE_DIR}/icu"
     "${WEBCORE_DIR}/inspector"
     "${WEBCORE_DIR}/loader"
     "${WEBCORE_DIR}/loader/archive"
     "${WEBCORE_DIR}/loader/icon"
     "${WEBCORE_DIR}/loader/cache"
-    "${WEBCORE_DIR}/page"
     "${WEBCORE_DIR}/page/animation"
     "${WEBCORE_DIR}/page/scrolling"
     "${WEBCORE_DIR}/platform"
@@ -148,6 +148,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
     "${CMAKE_BINARY_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
+    "${CMAKE_SOURCE_DIR}/WebKitLibraries"
 )
 
 set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES "")
@@ -769,6 +770,12 @@ endmacro()
 
 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
 
+# This needs to be after UIProcess/Cocoa on Mac.
+# FIXME: There is a conflict with including DiagnosticLoggingClient.h.
+list(APPEND WebKit2_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/page"
+)
+
 GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
 
 include_directories(${WebKit2_INCLUDE_DIRECTORIES})

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index fe3fa18..35ba4ef 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2015-10-22  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=150466
+
+        Reviewed by Chris Dumez.
+
+        * CMakeLists.txt:
+        * PlatformMac.cmake:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+
 2015-10-22  Anders Carlsson  <andersca@apple.com>
 
         NativeContextMenuItem isn't needed anymore, remove it

diff --git a/Source/WebKit2/PlatformMac.cmake b/Source/WebKit2/PlatformMac.cmake
index e5e26c0..01aaa7d 100644 (file)
--- a/Source/WebKit2/PlatformMac.cmake
+++ b/Source/WebKit2/PlatformMac.cmake
@@ -1,6 +1,13 @@
 add_definitions(-ObjC++)
 
-find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
+if ("${CURRENT_OSX_VERSION}" MATCHES "10.9")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceMavericks.a)
+elif ("${CURRENT_OSX_VERSION}" MATCHES "10.10")
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceYosemite.a)
+else ()
+set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
+endif ()
+link_directories(../../WebKitLibraries)
 
 find_library(ACCELERATE_LIBRARY accelerate)
 find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
@@ -19,6 +26,8 @@ find_library(SQLITE3_LIBRARY sqlite3)
 find_library(XML2_LIBRARY XML2)
 find_package(ZLIB REQUIRED)
 
+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+
 list(APPEND WebKit2_LIBRARIES
     ${ACCELERATE_LIBRARY}
     ${AUDIOTOOLBOX_LIBRARY}
@@ -30,7 +39,6 @@ list(APPEND WebKit2_LIBRARIES
     ${IOKIT_LIBRARY}
     ${IOSURFACE_LIBRARY}
     ${OPENGL_LIBRARY}
-    ${PDFKIT_FRAMEWORK}/PDFKit
     ${QUARTZ_LIBRARY}
     ${QUARTZCORE_LIBRARY}
     ${SECURITY_LIBRARY}
@@ -48,12 +56,37 @@ list(APPEND WebKit2_SOURCES
     NetworkProcess/mac/NetworkResourceLoaderMac.mm
     NetworkProcess/mac/RemoteNetworkingContext.mm
 
+    Shared/API/Cocoa/RemoteObjectRegistry.mm
+    Shared/API/Cocoa/WKBrowsingContextHandle.mm
+    Shared/API/Cocoa/WKRemoteObject.mm
+    Shared/API/Cocoa/WKRemoteObjectCoder.mm
+    Shared/API/Cocoa/WebKit.m
+    Shared/API/Cocoa/_WKFrameHandle.mm
+    Shared/API/Cocoa/_WKHitTestResult.mm
+    Shared/API/Cocoa/_WKNSFileManagerExtras.mm
+    Shared/API/Cocoa/_WKRemoteObjectInterface.mm
+    Shared/API/Cocoa/_WKRemoteObjectRegistry.mm
+
+    Shared/API/c/cf/WKErrorCF.cpp
+    Shared/API/c/cf/WKStringCF.mm
+    Shared/API/c/cf/WKURLCF.mm
+
+    Shared/API/c/cg/WKImageCG.cpp
+
+    Shared/API/c/mac/WKCertificateInfoMac.mm
+    Shared/API/c/mac/WKObjCTypeWrapperRef.mm
+    Shared/API/c/mac/WKURLRequestNS.mm
+    Shared/API/c/mac/WKURLResponseNS.mm
+    Shared/API/c/mac/WKWebArchive.cpp
+    Shared/API/c/mac/WKWebArchiveResource.cpp
+
     UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
     UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
     UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
     UIProcess/API/Cocoa/LegacyBundleForClass.mm
     UIProcess/API/Cocoa/WKBackForwardList.mm
     UIProcess/API/Cocoa/WKBackForwardListItem.mm
+    UIProcess/API/Cocoa/WKBrowsingContextController.mm
     UIProcess/API/Cocoa/WKError.mm
     UIProcess/API/Cocoa/WKFrameInfo.mm
     UIProcess/API/Cocoa/WKNavigation.mm
@@ -130,29 +163,38 @@ list(APPEND WebKit2_SOURCES
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
 
 list(APPEND WebKit2_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/platform/cf"
     "${WEBCORE_DIR}/platform/mac"
     "${WEBCORE_DIR}/platform/network/cf"
+    "${WEBCORE_DIR}/platform/network/cocoa"
+    "${WEBCORE_DIR}/platform/spi/mac"
+    "${WEBCORE_DIR}/platform/graphics/cg"
     "${WEBCORE_DIR}/platform/graphics/opentype"
     "${WEBKIT2_DIR}/NetworkProcess/cocoa"
     "${WEBKIT2_DIR}/NetworkProcess/mac"
     "${WEBKIT2_DIR}/UIProcess/mac"
     "${WEBKIT2_DIR}/UIProcess/API/C/mac"
+    "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
+    "${WEBKIT2_DIR}/UIProcess/API/mac"
     "${WEBKIT2_DIR}/UIProcess/Cocoa"
     "${WEBKIT2_DIR}/UIProcess/Scrolling"
     "${WEBKIT2_DIR}/Platform/mac"
     "${WEBKIT2_DIR}/Platform/IPC/mac"
+    "${WEBKIT2_DIR}/Platform/spi/Cocoa"
     "${WEBKIT2_DIR}/Shared/API/Cocoa"
     "${WEBKIT2_DIR}/Shared/API/c/cf"
+    "${WEBKIT2_DIR}/Shared/API/c/cg"
+    "${WEBKIT2_DIR}/Shared/API/c/mac"
     "${WEBKIT2_DIR}/Shared/cf"
     "${WEBKIT2_DIR}/Shared/Cocoa"
     "${WEBKIT2_DIR}/Shared/mac"
     "${WEBKIT2_DIR}/Shared/Plugins/mac"
+    "${WEBKIT2_DIR}/Shared/Scrolling"
     "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
     "${WEBKIT2_DIR}/WebProcess/Scrolling"
     "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
     "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
-    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
 )
 
 set(WEBKIT2_EXTRA_DEPENDENCIES
@@ -180,7 +222,20 @@ set(WebKit2_FORWARDING_HEADERS_FILES
     UIProcess/API/C/WKPageRenderingProgressEvents.h
 )
 
+list(APPEND WebKit2_MESSAGES_IN_FILES
+    Shared/API/Cocoa/RemoteObjectRegistry.messages.in
+
+    Shared/mac/SecItemShim.messages.in
+
+    UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in
+    UIProcess/mac/SecItemShimProxy.messages.in
+    UIProcess/mac/ViewGestureController.messages.in
+
+    WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
+)
+
 set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+    Shared/API/Cocoa
     Shared/API/c
 
     Shared/API/c/mac

diff --git a/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
index cd45706..e32f3a0 100644 (file)
--- a/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
+++ b/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
@@ -33,7 +33,6 @@
 #import "WKBrowsingContextControllerInternal.h"
 #import "WKBrowsingContextControllerInternal.h"
 #import "WebKitSystemInterface.h"
-#import "WebMemoryPressureHandlerIOS.h"
 #import "WebPageGroup.h"
 #import "WebPreferencesKeys.h"
 #import "WebProcessCreationParameters.h"
@@ -54,6 +53,7 @@
 
 #if PLATFORM(IOS)
 #import "ArgumentCodersCF.h"
+#import "WebMemoryPressureHandlerIOS.h"
 #import <WebCore/RuntimeApplicationChecksIOS.h>
 #else
 #import <QuartzCore/CARemoteLayerServer.h>