Diff
Modified: trunk/Source/WebCore/ChangeLog (191472 => 191473)
--- trunk/Source/WebCore/ChangeLog 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebCore/ChangeLog 2015-10-22 21:17:59 UTC (rev 191473)
@@ -1,3 +1,16 @@
+2015-10-22 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
Modified: trunk/Source/WebCore/PlatformMac.cmake (191472 => 191473)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-22 21:17:59 UTC (rev 191473)
@@ -99,8 +99,8 @@
)
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 @@
page/mac/SettingsMac.mm
page/mac/TextIndicatorWindow.mm
page/mac/UserAgentMac.mm
+ page/mac/WheelEventDeltaFilterMac.mm
page/scrolling/AsyncScrollingCoordinator.cpp
@@ -280,6 +281,7 @@
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 @@
platform/animation
platform/audio
+ platform/cf
+ platform/cocoa
platform/graphics
platform/mac
platform/mediastream
@@ -568,6 +572,7 @@
platform/text
platform/graphics/ca
+ platform/graphics/cocoa
platform/graphics/cg
platform/graphics/filters
platform/graphics/mac
Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (191472 => 191473)
--- trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2015-10-22 21:17:59 UTC (rev 191473)
@@ -93,7 +93,7 @@
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 @@
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 @@
status = SecItemAdd((CFDictionaryRef)attributes, nullptr);
if (status) {
WTFLogAlways("Cannot store WebCrypto master key, error %d", (int)status);
- return nullptr;
+ return false;
}
return true;
}
Modified: trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm (191472 => 191473)
--- trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm 2015-10-22 21:17:59 UTC (rev 191473)
@@ -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"
Modified: trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h (191472 => 191473)
--- trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h 2015-10-22 21:17:59 UTC (rev 191473)
@@ -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
Modified: trunk/Source/WebKit2/CMakeLists.txt (191472 => 191473)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-22 21:17:59 UTC (rev 191473)
@@ -93,12 +93,12 @@
"${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 @@
"${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 @@
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})
Modified: trunk/Source/WebKit2/ChangeLog (191472 => 191473)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 21:17:59 UTC (rev 191473)
@@ -1,3 +1,14 @@
+2015-10-22 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
NativeContextMenuItem isn't needed anymore, remove it
Modified: trunk/Source/WebKit2/PlatformMac.cmake (191472 => 191473)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-22 21:17:59 UTC (rev 191473)
@@ -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(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 @@
${IOKIT_LIBRARY}
${IOSURFACE_LIBRARY}
${OPENGL_LIBRARY}
- ${PDFKIT_FRAMEWORK}/PDFKit
${QUARTZ_LIBRARY}
${QUARTZCORE_LIBRARY}
${SECURITY_LIBRARY}
@@ -48,12 +56,37 @@
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 @@
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 @@
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
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (191472 => 191473)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-10-22 21:14:06 UTC (rev 191472)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-10-22 21:17:59 UTC (rev 191473)
@@ -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>