Diff
Modified: trunk/Source/WebCore/ChangeLog (191517 => 191518)
--- trunk/Source/WebCore/ChangeLog 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebCore/ChangeLog 2015-10-23 23:55:41 UTC (rev 191518)
@@ -1,3 +1,12 @@
+2015-10-23 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=150517
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
2015-10-23 Per Arne Vollan <[email protected]>
[WinCairo] Improve test results for fast layouttests.
Modified: trunk/Source/WebCore/PlatformMac.cmake (191517 => 191518)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-23 23:55:41 UTC (rev 191518)
@@ -261,6 +261,8 @@
platform/cf/CFURLExtras.cpp
platform/cf/CoreMediaSoftLink.cpp
platform/cf/FileSystemCF.cpp
+ platform/cf/KeyedDecoderCF.cpp
+ platform/cf/KeyedEncoderCF.cpp
platform/cf/MediaAccessibilitySoftLink.cpp
platform/cf/RunLoopObserver.cpp
platform/cf/SharedBufferCF.cpp
@@ -314,6 +316,7 @@
platform/graphics/ca/GraphicsLayerCA.cpp
platform/graphics/ca/LayerFlushScheduler.cpp
platform/graphics/ca/LayerPool.cpp
+ platform/graphics/ca/PlatformCAAnimation.cpp
platform/graphics/ca/PlatformCALayer.cpp
platform/graphics/ca/TileController.cpp
platform/graphics/ca/TileCoverageMap.cpp
@@ -555,6 +558,8 @@
page/mac
page/scrolling
+ page/scrolling/mac
+
platform/animation
platform/audio
platform/cf
@@ -574,6 +579,8 @@
platform/graphics/mac
platform/graphics/transforms
+ platform/graphics/ca/cocoa
+
platform/network/cf
platform/network/cocoa
platform/network/mac
Modified: trunk/Source/WebKit/ChangeLog (191517 => 191518)
--- trunk/Source/WebKit/ChangeLog 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit/ChangeLog 2015-10-23 23:55:41 UTC (rev 191518)
@@ -1,3 +1,12 @@
+2015-10-23 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=150517
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
2015-10-18 Sungmann Cho <[email protected]>
Fix the builds with ENABLE_INDEX_DATABASE=OFF.
Modified: trunk/Source/WebKit/PlatformMac.cmake (191517 => 191518)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-10-23 23:55:41 UTC (rev 191518)
@@ -290,7 +290,6 @@
mac/WebCoreSupport
mac/WebInspector
mac/WebView
- ${DERIVED_SOURCES_WEBCORE_DIR}
${WEBCORE_DIR}/bindings/objc
${WEBCORE_DIR}/plugins
)
@@ -411,3 +410,17 @@
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
+
+set(WebKitLegacy_WebCore_FORWARDING_HEADERS
+ DOMElement.h
+ DOMHTMLFormElement.h
+ DOMHTMLInputElement.h
+ DOMWheelEvent.h
+)
+
+# FIXME: These shouldn't be necessary, but it doesn't compile without them.
+foreach (_file ${WebKitLegacy_WebCore_FORWARDING_HEADERS})
+ if (NOT EXISTS ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file})
+ file(WRITE ${DERIVED_SOURCES_WEBKITLEGACY_DIR}/${_file} "#import <WebCore/${_file}>")
+ endif ()
+endforeach ()
Modified: trunk/Source/WebKit2/CMakeLists.txt (191517 => 191518)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-23 23:55:41 UTC (rev 191518)
@@ -336,7 +336,6 @@
UIProcess/FrameLoadState.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
UIProcess/GeolocationPermissionRequestProxy.cpp
- UIProcess/LegacySessionStateCodingNone.cpp
UIProcess/PageLoadState.cpp
UIProcess/ProcessAssertion.cpp
UIProcess/ProcessThrottler.cpp
Modified: trunk/Source/WebKit2/ChangeLog (191517 => 191518)
--- trunk/Source/WebKit2/ChangeLog 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-23 23:55:41 UTC (rev 191518)
@@ -1,3 +1,17 @@
+2015-10-23 Alex Christensen <[email protected]>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=150517
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformMac.cmake:
+ * WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp: Removed.
+ * WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Removed.
+
2015-10-23 Tim Horton <[email protected]>
WKView being inside WKWebView leads to weird API issues
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (191517 => 191518)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-10-23 23:55:41 UTC (rev 191518)
@@ -63,6 +63,7 @@
UIProcess/BackingStore.cpp
UIProcess/DefaultUndoController.cpp
+ UIProcess/LegacySessionStateCodingNone.cpp
UIProcess/API/C/CoordinatedGraphics/WKView.cpp
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (191517 => 191518)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-10-23 23:55:41 UTC (rev 191518)
@@ -89,6 +89,7 @@
UIProcess/BackingStore.cpp
UIProcess/DefaultUndoController.cpp
UIProcess/DrawingAreaProxyImpl.cpp
+ UIProcess/LegacySessionStateCodingNone.cpp
UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
Modified: trunk/Source/WebKit2/PlatformMac.cmake (191517 => 191518)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-23 23:55:41 UTC (rev 191518)
@@ -22,11 +22,13 @@
find_library(QUARTZ_LIBRARY Quartz)
find_library(QUARTZCORE_LIBRARY QuartzCore)
find_library(SECURITY_LIBRARY Security)
+find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
find_library(SQLITE3_LIBRARY sqlite3)
find_library(XML2_LIBRARY XML2)
find_package(ZLIB REQUIRED)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
list(APPEND WebKit2_LIBRARIES
${ACCELERATE_LIBRARY}
@@ -43,12 +45,19 @@
${QUARTZCORE_LIBRARY}
${SECURITY_LIBRARY}
${SQLITE3_LIBRARY}
+ ${SYSTEMCONFIGURATION_LIBRARY}
${WEBKITSYSTEMINTERFACE_LIBRARY}
${XML2_LIBRARY}
${ZLIB_LIBRARIES}
+ WebKit
)
list(APPEND WebKit2_SOURCES
+ DatabaseProcess/mac/DatabaseProcessMac.mm
+
+ NetworkProcess/cache/NetworkCacheDataCocoa.mm
+ NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
+
NetworkProcess/cocoa/NetworkProcessCocoa.mm
NetworkProcess/mac/NetworkDiskCacheMonitor.mm
@@ -56,6 +65,29 @@
NetworkProcess/mac/NetworkResourceLoaderMac.mm
NetworkProcess/mac/RemoteNetworkingContext.mm
+ Platform/IPC/MessageRecorder.cpp
+
+ Platform/IPC/mac/ConnectionMac.mm
+
+ Platform/cf/ModuleCF.cpp
+
+ Platform/cg/CGUtilities.cpp
+
+ Platform/foundation/LoggingFoundation.mm
+
+ Platform/mac/LayerHostingContext.mm
+ Platform/mac/MachUtilities.cpp
+ Platform/mac/MenuUtilities.mm
+ Platform/mac/SharedMemoryMac.cpp
+ Platform/mac/StringUtilities.mm
+
+ PluginProcess/mac/PluginControllerProxyMac.mm
+ PluginProcess/mac/PluginProcessMac.mm
+ PluginProcess/mac/PluginProcessShim.mm
+
+ Shared/APIWebArchive.mm
+ Shared/APIWebArchiveResource.mm
+
Shared/API/Cocoa/RemoteObjectRegistry.mm
Shared/API/Cocoa/WKBrowsingContextHandle.mm
Shared/API/Cocoa/WKRemoteObject.mm
@@ -80,6 +112,72 @@
Shared/API/c/mac/WKWebArchive.cpp
Shared/API/c/mac/WKWebArchiveResource.cpp
+ Shared/Authentication/mac/AuthenticationManager.mac.mm
+
+ Shared/Cocoa/APIDataCocoa.mm
+ Shared/Cocoa/APIObject.mm
+ Shared/Cocoa/CompletionHandlerCallChecker.mm
+ Shared/Cocoa/WKNSArray.mm
+ Shared/Cocoa/WKNSData.mm
+ Shared/Cocoa/WKNSDictionary.mm
+ Shared/Cocoa/WKNSError.mm
+ Shared/Cocoa/WKNSString.mm
+ Shared/Cocoa/WKNSURL.mm
+ Shared/Cocoa/WKNSURLExtras.mm
+ Shared/Cocoa/WKNSURLRequest.mm
+ Shared/Cocoa/WKObject.mm
+
+ Shared/Downloads/mac/DownloadMac.mm
+
+ Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
+
+ Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+ Shared/Plugins/Netscape/mac/PluginInformationMac.mm
+
+ Shared/Plugins/mac/PluginSandboxProfile.mm
+
+ Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp
+
+ Shared/cf/ArgumentCodersCF.cpp
+
+ Shared/cg/ShareableBitmapCG.cpp
+
+ Shared/mac/ArgumentCodersMac.mm
+ Shared/mac/AttributedString.mm
+ Shared/mac/ChildProcessMac.mm
+ Shared/mac/ColorSpaceData.mm
+ Shared/mac/CookieStorageShim.mm
+ Shared/mac/CookieStorageShimLibrary.cpp
+ Shared/mac/HangDetectionDisablerMac.mm
+ Shared/mac/NativeWebGestureEventMac.mm
+ Shared/mac/NativeWebKeyboardEventMac.mm
+ Shared/mac/NativeWebMouseEventMac.mm
+ Shared/mac/NativeWebWheelEventMac.mm
+ Shared/mac/ObjCObjectGraph.mm
+ Shared/mac/PDFKitImports.mm
+ Shared/mac/PasteboardTypes.mm
+ Shared/mac/PrintInfoMac.mm
+ Shared/mac/RemoteLayerBackingStore.mm
+ Shared/mac/RemoteLayerBackingStoreCollection.mm
+ Shared/mac/RemoteLayerTreePropertyApplier.mm
+ Shared/mac/RemoteLayerTreeTransaction.mm
+ Shared/mac/SandboxExtensionMac.mm
+ Shared/mac/SandboxInitialiationParametersMac.mm
+ Shared/mac/SandboxUtilities.mm
+ Shared/mac/SecItemRequestData.cpp
+ Shared/mac/SecItemResponseData.cpp
+ Shared/mac/SecItemShim.cpp
+ Shared/mac/WebCoreArgumentCodersMac.mm
+ Shared/mac/WebEventFactory.mm
+ Shared/mac/WebGestureEvent.cpp
+ Shared/mac/WebHitTestResultData.mm
+ Shared/mac/WebMemorySampler.mac.mm
+
+ UIProcess/ViewGestureController.cpp
+
+ UIProcess/API/APIUserScript.cpp
+ UIProcess/API/APIWebsiteDataRecord.cpp
+
UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
@@ -87,15 +185,20 @@
UIProcess/API/Cocoa/WKBackForwardList.mm
UIProcess/API/Cocoa/WKBackForwardListItem.mm
UIProcess/API/Cocoa/WKBrowsingContextController.mm
+ UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
+ UIProcess/API/Cocoa/WKConnection.mm
UIProcess/API/Cocoa/WKError.mm
UIProcess/API/Cocoa/WKFrameInfo.mm
+ UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
UIProcess/API/Cocoa/WKNavigation.mm
UIProcess/API/Cocoa/WKNavigationAction.mm
+ UIProcess/API/Cocoa/WKNavigationData.mm
UIProcess/API/Cocoa/WKNavigationResponse.mm
UIProcess/API/Cocoa/WKPreferences.mm
UIProcess/API/Cocoa/WKProcessPool.mm
UIProcess/API/Cocoa/WKScriptMessage.mm
UIProcess/API/Cocoa/WKSecurityOrigin.mm
+ UIProcess/API/Cocoa/WKTypeRefWrapper.mm
UIProcess/API/Cocoa/WKUserContentController.mm
UIProcess/API/Cocoa/WKUserScript.mm
UIProcess/API/Cocoa/WKWebView.mm
@@ -113,6 +216,7 @@
UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
UIProcess/API/Cocoa/_WKUserContentFilter.mm
UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
+ UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
UIProcess/API/mac/WKView.mm
@@ -130,7 +234,27 @@
UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
UIProcess/Cocoa/WebProcessPoolCocoa.mm
UIProcess/Cocoa/WebProcessProxyCocoa.mm
+ UIProcess/Cocoa/WebViewImpl.mm
+ UIProcess/Databases/mac/DatabaseProcessProxyMac.mm
+
+ UIProcess/Launcher/mac/DynamicLinkerEnvironmentExtractor.mm
+ UIProcess/Launcher/mac/EnvironmentVariables.cpp
+ UIProcess/Launcher/mac/ProcessLauncherMac.mm
+
+ UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm
+
+ UIProcess/Network/mac/NetworkProcessProxyMac.mm
+
+ UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+ UIProcess/Plugins/mac/PluginProcessManagerMac.mm
+ UIProcess/Plugins/mac/PluginProcessProxyMac.mm
+
+ UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp
+ UIProcess/Scrolling/RemoteScrollingTree.cpp
+
+ UIProcess/Storage/StorageManager.cpp
+
UIProcess/mac/CorrectionPanel.mm
UIProcess/mac/LegacySessionStateCoding.cpp
UIProcess/mac/PageClientImpl.mm
@@ -158,27 +282,105 @@
UIProcess/mac/WebPreferencesMac.mm
UIProcess/mac/WebProcessProxyMac.mm
UIProcess/mac/WindowServerConnection.mm
+
+ WebProcess/Cookies/mac/WebCookieManagerMac.mm
+
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessBundleParameters.mm
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.mm
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInHitTestResult.mm
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInPageGroup.mm
+ WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInScriptWorld.mm
+
+ WebProcess/InjectedBundle/API/mac/WKDOMDocument.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMElement.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMNode.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMRange.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMText.mm
+ WebProcess/InjectedBundle/API/mac/WKDOMTextIterator.mm
+ WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm
+ WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm
+
+ WebProcess/InjectedBundle/mac/InjectedBundleMac.mm
+
+ WebProcess/MediaCache/WebMediaCacheManager.cpp
+ WebProcess/MediaCache/WebMediaKeyStorageManager.cpp
+
+ WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+ WebProcess/Plugins/Netscape/mac/PluginProxyMac.mm
+ WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm
+
+ WebProcess/Plugins/PDF/PDFPlugin.mm
+ WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
+ WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
+ WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
+ WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
+
+ WebProcess/Scrolling/RemoteScrollingCoordinator.mm
+
+ WebProcess/WebCoreSupport/WebPasteboardOverrides.cpp
+
+ WebProcess/WebCoreSupport/mac/WebAlternativeTextClient.cpp
+ WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
+ WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
+ WebProcess/WebCoreSupport/mac/WebEditorClientMac.mm
+ WebProcess/WebCoreSupport/mac/WebErrorsMac.mm
+ WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
+ WebProcess/WebCoreSupport/mac/WebPopupMenuMac.mm
+ WebProcess/WebCoreSupport/mac/WebSystemInterface.mm
+
+ WebProcess/WebPage/ViewGestureGeometryCollector.cpp
+
+ WebProcess/WebPage/Cocoa/RemoteLayerTreeDisplayRefreshMonitor.mm
+
+ WebProcess/WebPage/mac/GraphicsLayerCARemote.cpp
+ WebProcess/WebPage/mac/PageBannerMac.mm
+ WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
+ WebProcess/WebPage/mac/PlatformCALayerRemote.cpp
+ WebProcess/WebPage/mac/PlatformCALayerRemoteCustom.mm
+ WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp
+ WebProcess/WebPage/mac/RemoteLayerTreeContext.mm
+ WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
+ WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
+ WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm
+ WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
+ WebProcess/WebPage/mac/WebInspectorUIMac.mm
+ WebProcess/WebPage/mac/WebPageMac.mm
+
+ WebProcess/cocoa/WebProcessCocoa.mm
+
+ WebProcess/mac/SecItemShimLibrary.mm
)
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/icu"
"${WEBCORE_DIR}/platform/cf"
+ "${WEBCORE_DIR}/platform/cocoa"
"${WEBCORE_DIR}/platform/mac"
"${WEBCORE_DIR}/platform/network/cf"
"${WEBCORE_DIR}/platform/network/cocoa"
"${WEBCORE_DIR}/platform/spi/mac"
+ "${WEBCORE_DIR}/platform/graphics/ca"
"${WEBCORE_DIR}/platform/graphics/cg"
"${WEBCORE_DIR}/platform/graphics/opentype"
"${WEBKIT2_DIR}/NetworkProcess/cocoa"
"${WEBKIT2_DIR}/NetworkProcess/mac"
+ "${WEBKIT2_DIR}/PluginProcess/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/Launcher/mac"
"${WEBKIT2_DIR}/UIProcess/Scrolling"
+ "${WEBKIT2_DIR}/Platform/cg"
"${WEBKIT2_DIR}/Platform/mac"
+ "${WEBKIT2_DIR}/Platform/unix"
+ "${WEBKIT2_DIR}/Platform/spi/Cocoa"
+ "${WEBKIT2_DIR}/Platform/spi/mac"
"${WEBKIT2_DIR}/Platform/IPC/mac"
"${WEBKIT2_DIR}/Platform/spi/Cocoa"
"${WEBKIT2_DIR}/Shared/API/Cocoa"
@@ -190,20 +392,38 @@
"${WEBKIT2_DIR}/Shared/mac"
"${WEBKIT2_DIR}/Shared/Plugins/mac"
"${WEBKIT2_DIR}/Shared/Scrolling"
+ "${WEBKIT2_DIR}/WebProcess/mac"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/Cocoa"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/mac"
"${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
+ "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/mac"
"${WEBKIT2_DIR}/WebProcess/Scrolling"
+ "${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
"${WEBKIT2_DIR}/WebProcess/WebPage/mac"
"${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
)
+# This is needed because of a naming conflict with DiagnosticLoggingClient.h.
+# FIXME: Rename one of the DiagnosticLoggingClient headers.
+list(REMOVE_ITEM WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/page"
+)
+list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/page"
+)
+
set(WEBKIT2_EXTRA_DEPENDENCIES
WebKit2-forwarding-headers
)
set(WebProcess_SOURCES
- WebProcess/mac/SecItemShimLibrary.mm
+ WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
)
+set(PluginProcess_SOURCES
+ PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm
+)
+
list(APPEND NetworkProcess_SOURCES
${NetworkProcess_COMMON_SOURCES}
)
@@ -231,10 +451,12 @@
UIProcess/mac/SecItemShimProxy.messages.in
UIProcess/mac/ViewGestureController.messages.in
+ WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in
WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
)
set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+ Shared
Shared/API/Cocoa
Shared/API/c
@@ -247,7 +469,19 @@
WebProcess/WebPage
+ WebProcess/InjectedBundle/API/Cocoa
WebProcess/InjectedBundle/API/c
+ WebProcess/InjectedBundle/API/mac
)
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/MessageRecorderProbes.h
+ MAIN_DEPENDENCY Platform/IPC/MessageRecorderProbes.d
+ WORKING_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR}
+ COMMAND dtrace -h -s ${WEBKIT2_DIR}/Platform/IPC/MessageRecorderProbes.d
+ VERBATIM)
+list(APPEND WebKit2_SOURCES
+ ${DERIVED_SOURCES_WEBKIT2_DIR}/MessageRecorderProbes.h
+)
+
WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
Deleted: trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp (191517 => 191518)
--- trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp 2015-10-23 23:55:41 UTC (rev 191518)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebCookieManager.h"
-
-#include <CFNetwork/CFHTTPCookiesPriv.h>
-#include <WebCore/CookieStorage.h>
-#include <WebCore/NetworkStorageSession.h>
-
-#if PLATFORM(MAC)
-#include <WebKitSystemInterface.h>
-#endif
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
-{
-#if PLATFORM(MAC)
- CFHTTPCookieStorageRef defaultCookieStorage = WKGetDefaultHTTPCookieStorage();
-#endif
-
- CFHTTPCookieStorageSetCookieAcceptPolicy(defaultCookieStorage, policy);
-
- ASSERT_NOT_REACHED();
-#if NEEDS_FIXING_AFTER_R134960
- if (RetainPtr<CFHTTPCookieStorageRef> cookieStorage = currentCFHTTPCookieStorage())
- CFHTTPCookieStorageSetCookieAcceptPolicy(cookieStorage.get(), policy);
-#endif
-}
-
-HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
-{
- ASSERT_NOT_REACHED();
-#if NEEDS_FIXING_AFTER_R134960
- RetainPtr<CFHTTPCookieStorageRef> cookieStorage = currentCFHTTPCookieStorage();
- return CFHTTPCookieStorageGetCookieAcceptPolicy(cookieStorage.get());
-#else
- return 0;
-#endif
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp (191517 => 191518)
--- trunk/Source/WebKit2/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp 2015-10-23 23:47:45 UTC (rev 191517)
+++ trunk/Source/WebKit2/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp 2015-10-23 23:55:41 UTC (rev 191518)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Brent Fulgham <[email protected]>. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebCookieManager.h"
-
-#include <WebCore/CookieStorage.h>
-#include <WebCore/NotImplemented.h>
-
-namespace WebKit {
-
-void WebCookieManager::platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy policy)
-{
- // Fixme: To be implemented
- notImplemented();
-}
-
-HTTPCookieAcceptPolicy WebCookieManager::platformGetHTTPCookieAcceptPolicy()
-{
- notImplemented();
- return HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain;
-}
-
-} // namespace WebKit