<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191518] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191518">191518</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-23 16:55:41 -0700 (Fri, 23 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Progress towards CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=150517
Reviewed by Tim Horton.
Source/WebCore:
* PlatformMac.cmake:
Source/WebKit:
* PlatformMac.cmake:
Source/WebKit2:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp: Removed.
* WebProcess/Cookies/curl/WebCookieManagerCurl.cpp: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformMaccmake">trunk/Source/WebCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformMaccmake">trunk/Source/WebKit/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessCookiescfWebCookieManagerCFNetcpp">trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiescurlWebCookieManagerCurlcpp">trunk/Source/WebKit2/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-23 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=150517
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-23 Per Arne Vollan <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Improve test results for fast layouttests.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -261,6 +261,8 @@
</span><span class="cx"> platform/cf/CFURLExtras.cpp
</span><span class="cx"> platform/cf/CoreMediaSoftLink.cpp
</span><span class="cx"> platform/cf/FileSystemCF.cpp
</span><ins>+ platform/cf/KeyedDecoderCF.cpp
+ platform/cf/KeyedEncoderCF.cpp
</ins><span class="cx"> platform/cf/MediaAccessibilitySoftLink.cpp
</span><span class="cx"> platform/cf/RunLoopObserver.cpp
</span><span class="cx"> platform/cf/SharedBufferCF.cpp
</span><span class="lines">@@ -314,6 +316,7 @@
</span><span class="cx"> platform/graphics/ca/GraphicsLayerCA.cpp
</span><span class="cx"> platform/graphics/ca/LayerFlushScheduler.cpp
</span><span class="cx"> platform/graphics/ca/LayerPool.cpp
</span><ins>+ platform/graphics/ca/PlatformCAAnimation.cpp
</ins><span class="cx"> platform/graphics/ca/PlatformCALayer.cpp
</span><span class="cx"> platform/graphics/ca/TileController.cpp
</span><span class="cx"> platform/graphics/ca/TileCoverageMap.cpp
</span><span class="lines">@@ -555,6 +558,8 @@
</span><span class="cx"> page/mac
</span><span class="cx"> page/scrolling
</span><span class="cx">
</span><ins>+ page/scrolling/mac
+
</ins><span class="cx"> platform/animation
</span><span class="cx"> platform/audio
</span><span class="cx"> platform/cf
</span><span class="lines">@@ -574,6 +579,8 @@
</span><span class="cx"> platform/graphics/mac
</span><span class="cx"> platform/graphics/transforms
</span><span class="cx">
</span><ins>+ platform/graphics/ca/cocoa
+
</ins><span class="cx"> platform/network/cf
</span><span class="cx"> platform/network/cocoa
</span><span class="cx"> platform/network/mac
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-23 Alex Christensen <achristensen@webkit.org>
+
+ Progress towards CMake on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=150517
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+
</ins><span class="cx"> 2015-10-18 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Fix the builds with ENABLE_INDEX_DATABASE=OFF.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformMac.cmake (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -290,7 +290,6 @@
</span><span class="cx"> mac/WebCoreSupport
</span><span class="cx"> mac/WebInspector
</span><span class="cx"> mac/WebView
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}
</del><span class="cx"> ${WEBCORE_DIR}/bindings/objc
</span><span class="cx"> ${WEBCORE_DIR}/plugins
</span><span class="cx"> )
</span><span class="lines">@@ -411,3 +410,17 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
</span><ins>+
+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 ()
</ins></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -336,7 +336,6 @@
</span><span class="cx"> UIProcess/FrameLoadState.cpp
</span><span class="cx"> UIProcess/GeolocationPermissionRequestManagerProxy.cpp
</span><span class="cx"> UIProcess/GeolocationPermissionRequestProxy.cpp
</span><del>- UIProcess/LegacySessionStateCodingNone.cpp
</del><span class="cx"> UIProcess/PageLoadState.cpp
</span><span class="cx"> UIProcess/ProcessAssertion.cpp
</span><span class="cx"> UIProcess/ProcessThrottler.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-23 Alex Christensen <achristensen@webkit.org>
+
+ 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.
+
</ins><span class="cx"> 2015-10-23 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx">
</span><span class="cx"> UIProcess/BackingStore.cpp
</span><span class="cx"> UIProcess/DefaultUndoController.cpp
</span><ins>+ UIProcess/LegacySessionStateCodingNone.cpp
</ins><span class="cx">
</span><span class="cx"> UIProcess/API/C/CoordinatedGraphics/WKView.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> UIProcess/BackingStore.cpp
</span><span class="cx"> UIProcess/DefaultUndoController.cpp
</span><span class="cx"> UIProcess/DrawingAreaProxyImpl.cpp
</span><ins>+ UIProcess/LegacySessionStateCodingNone.cpp
</ins><span class="cx">
</span><span class="cx"> UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,11 +22,13 @@
</span><span class="cx"> find_library(QUARTZ_LIBRARY Quartz)
</span><span class="cx"> find_library(QUARTZCORE_LIBRARY QuartzCore)
</span><span class="cx"> find_library(SECURITY_LIBRARY Security)
</span><ins>+find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
</ins><span class="cx"> find_library(SQLITE3_LIBRARY sqlite3)
</span><span class="cx"> find_library(XML2_LIBRARY XML2)
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><span class="cx">
</span><span class="cx"> add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
</span><ins>+add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
</ins><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><span class="cx"> ${ACCELERATE_LIBRARY}
</span><span class="lines">@@ -43,12 +45,19 @@
</span><span class="cx"> ${QUARTZCORE_LIBRARY}
</span><span class="cx"> ${SECURITY_LIBRARY}
</span><span class="cx"> ${SQLITE3_LIBRARY}
</span><ins>+ ${SYSTEMCONFIGURATION_LIBRARY}
</ins><span class="cx"> ${WEBKITSYSTEMINTERFACE_LIBRARY}
</span><span class="cx"> ${XML2_LIBRARY}
</span><span class="cx"> ${ZLIB_LIBRARIES}
</span><ins>+ WebKit
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_SOURCES
</span><ins>+ DatabaseProcess/mac/DatabaseProcessMac.mm
+
+ NetworkProcess/cache/NetworkCacheDataCocoa.mm
+ NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
+
</ins><span class="cx"> NetworkProcess/cocoa/NetworkProcessCocoa.mm
</span><span class="cx">
</span><span class="cx"> NetworkProcess/mac/NetworkDiskCacheMonitor.mm
</span><span class="lines">@@ -56,6 +65,29 @@
</span><span class="cx"> NetworkProcess/mac/NetworkResourceLoaderMac.mm
</span><span class="cx"> NetworkProcess/mac/RemoteNetworkingContext.mm
</span><span class="cx">
</span><ins>+ 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
+
</ins><span class="cx"> Shared/API/Cocoa/RemoteObjectRegistry.mm
</span><span class="cx"> Shared/API/Cocoa/WKBrowsingContextHandle.mm
</span><span class="cx"> Shared/API/Cocoa/WKRemoteObject.mm
</span><span class="lines">@@ -80,6 +112,72 @@
</span><span class="cx"> Shared/API/c/mac/WKWebArchive.cpp
</span><span class="cx"> Shared/API/c/mac/WKWebArchiveResource.cpp
</span><span class="cx">
</span><ins>+ 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
+
</ins><span class="cx"> UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
</span><span class="cx"> UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
</span><span class="lines">@@ -87,15 +185,20 @@
</span><span class="cx"> UIProcess/API/Cocoa/WKBackForwardList.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKBackForwardListItem.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKBrowsingContextController.mm
</span><ins>+ UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
+ UIProcess/API/Cocoa/WKConnection.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKError.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKFrameInfo.mm
</span><ins>+ UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKNavigation.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKNavigationAction.mm
</span><ins>+ UIProcess/API/Cocoa/WKNavigationData.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKNavigationResponse.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKPreferences.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKProcessPool.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKScriptMessage.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKSecurityOrigin.mm
</span><ins>+ UIProcess/API/Cocoa/WKTypeRefWrapper.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKUserContentController.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKUserScript.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKWebView.mm
</span><span class="lines">@@ -113,6 +216,7 @@
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKUserContentFilter.mm
</span><span class="cx"> UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
</span><ins>+ UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
</ins><span class="cx">
</span><span class="cx"> UIProcess/API/mac/WKView.mm
</span><span class="cx">
</span><span class="lines">@@ -130,7 +234,27 @@
</span><span class="cx"> UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
</span><span class="cx"> UIProcess/Cocoa/WebProcessPoolCocoa.mm
</span><span class="cx"> UIProcess/Cocoa/WebProcessProxyCocoa.mm
</span><ins>+ UIProcess/Cocoa/WebViewImpl.mm
</ins><span class="cx">
</span><ins>+ 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
+
</ins><span class="cx"> UIProcess/mac/CorrectionPanel.mm
</span><span class="cx"> UIProcess/mac/LegacySessionStateCoding.cpp
</span><span class="cx"> UIProcess/mac/PageClientImpl.mm
</span><span class="lines">@@ -158,27 +282,105 @@
</span><span class="cx"> UIProcess/mac/WebPreferencesMac.mm
</span><span class="cx"> UIProcess/mac/WebProcessProxyMac.mm
</span><span class="cx"> UIProcess/mac/WindowServerConnection.mm
</span><ins>+
+ 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
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_INCLUDE_DIRECTORIES
</span><ins>+ "${WEBCORE_DIR}/icu"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/cf"
</span><ins>+ "${WEBCORE_DIR}/platform/cocoa"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cocoa"
</span><span class="cx"> "${WEBCORE_DIR}/platform/spi/mac"
</span><ins>+ "${WEBCORE_DIR}/platform/graphics/ca"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics/cg"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/opentype"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/NetworkProcess/mac"
</span><ins>+ "${WEBKIT2_DIR}/PluginProcess/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Cocoa"
</span><ins>+ "${WEBKIT2_DIR}/UIProcess/Launcher/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Scrolling"
</span><ins>+ "${WEBKIT2_DIR}/Platform/cg"
</ins><span class="cx"> "${WEBKIT2_DIR}/Platform/mac"
</span><ins>+ "${WEBKIT2_DIR}/Platform/unix"
+ "${WEBKIT2_DIR}/Platform/spi/Cocoa"
+ "${WEBKIT2_DIR}/Platform/spi/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/Platform/IPC/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/spi/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/Cocoa"
</span><span class="lines">@@ -190,20 +392,38 @@
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Scrolling"
</span><ins>+ "${WEBKIT2_DIR}/WebProcess/mac"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/Cocoa"
+ "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
</span><ins>+ "${WEBKIT2_DIR}/WebProcess/Plugins/Netscape/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Scrolling"
</span><ins>+ "${WEBKIT2_DIR}/WebProcess/WebPage/Cocoa"
</ins><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/mac"
</span><span class="cx"> "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# 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"
+)
+
</ins><span class="cx"> set(WEBKIT2_EXTRA_DEPENDENCIES
</span><span class="cx"> WebKit2-forwarding-headers
</span><span class="cx"> )
</span><span class="cx"> set(WebProcess_SOURCES
</span><del>- WebProcess/mac/SecItemShimLibrary.mm
</del><ins>+ WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+set(PluginProcess_SOURCES
+ PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm
+)
+
</ins><span class="cx"> list(APPEND NetworkProcess_SOURCES
</span><span class="cx"> ${NetworkProcess_COMMON_SOURCES}
</span><span class="cx"> )
</span><span class="lines">@@ -231,10 +451,12 @@
</span><span class="cx"> UIProcess/mac/SecItemShimProxy.messages.in
</span><span class="cx"> UIProcess/mac/ViewGestureController.messages.in
</span><span class="cx">
</span><ins>+ WebProcess/Scrolling/RemoteScrollingCoordinator.messages.in
</ins><span class="cx"> WebProcess/WebPage/ViewGestureGeometryCollector.messages.in
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ Shared
</ins><span class="cx"> Shared/API/Cocoa
</span><span class="cx"> Shared/API/c
</span><span class="cx">
</span><span class="lines">@@ -247,7 +469,19 @@
</span><span class="cx">
</span><span class="cx"> WebProcess/WebPage
</span><span class="cx">
</span><ins>+ WebProcess/InjectedBundle/API/Cocoa
</ins><span class="cx"> WebProcess/InjectedBundle/API/c
</span><ins>+ WebProcess/InjectedBundle/API/mac
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+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
+)
+
</ins><span class="cx"> WEBKIT_CREATE_FORWARDING_HEADERS(WebKit FILES ${WebKit2_FORWARDING_HEADERS_FILES} DIRECTORIES ${WebKit2_FORWARDING_HEADERS_DIRECTORIES})
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiescfWebCookieManagerCFNetcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/Cookies/cf/WebCookieManagerCFNet.cpp (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiescurlWebCookieManagerCurlcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/Cookies/curl/WebCookieManagerCurl.cpp (191517 => 191518)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2011 Brent Fulgham <bfulgham@webkit.org>. 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
</del></span></pre>
</div>
</div>
</body>
</html>