<!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>[191473] 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/191473">191473</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-10-22 14:17:59 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</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="#trunkSourceWebCorecryptomacSerializedCryptoKeyWrapMacmm">trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacWheelEventDeltaFilterMacmm">trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh">trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h</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="#trunkSourceWebKit2PlatformMaccmake">trunk/Source/WebKit2/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-10-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Migrate WKSetPatternPhaseInUserSpace() and WKGetUserToBaseCTM() from WKSI
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformMac.cmake (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><del>- "/usr/include/libxslt"
- "/usr/include/libxml2"
</del><ins>+ "${CMAKE_OSX_SYSROOT}/usr/include/libxslt"
+ "${CMAKE_OSX_SYSROOT}/usr/include/libxml2"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="lines">@@ -233,6 +233,7 @@
</span><span class="cx"> page/mac/SettingsMac.mm
</span><span class="cx"> page/mac/TextIndicatorWindow.mm
</span><span class="cx"> page/mac/UserAgentMac.mm
</span><ins>+ page/mac/WheelEventDeltaFilterMac.mm
</ins><span class="cx">
</span><span class="cx"> page/scrolling/AsyncScrollingCoordinator.cpp
</span><span class="cx">
</span><span class="lines">@@ -280,6 +281,7 @@
</span><span class="cx"> platform/cocoa/ParentalControlsContentFilter.mm
</span><span class="cx"> platform/cocoa/ScrollController.mm
</span><span class="cx"> platform/cocoa/ScrollSnapAnimatorState.mm
</span><ins>+ platform/cocoa/SearchPopupMenuCocoa.mm
</ins><span class="cx"> platform/cocoa/SystemVersion.mm
</span><span class="cx"> platform/cocoa/TelephoneNumberDetectorCocoa.cpp
</span><span class="cx"> platform/cocoa/ThemeCocoa.cpp
</span><span class="lines">@@ -559,6 +561,8 @@
</span><span class="cx">
</span><span class="cx"> platform/animation
</span><span class="cx"> platform/audio
</span><ins>+ platform/cf
+ platform/cocoa
</ins><span class="cx"> platform/graphics
</span><span class="cx"> platform/mac
</span><span class="cx"> platform/mediastream
</span><span class="lines">@@ -568,6 +572,7 @@
</span><span class="cx"> platform/text
</span><span class="cx">
</span><span class="cx"> platform/graphics/ca
</span><ins>+ platform/graphics/cocoa
</ins><span class="cx"> platform/graphics/cg
</span><span class="cx"> platform/graphics/filters
</span><span class="cx"> platform/graphics/mac
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacSerializedCryptoKeyWrapMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> status = SecAccessCreate((CFStringRef)localizedItemName, nullptr, &accessRef);
</span><span class="cx"> if (status) {
</span><span class="cx"> WTFLogAlways("Cannot create a security access object for storing WebCrypto master key, error %d", (int)status);
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> RetainPtr<SecAccessRef> access = adoptCF(accessRef);
</span><span class="cx">
</span><span class="lines">@@ -104,14 +104,14 @@
</span><span class="cx"> status = SecTrustedApplicationCreateFromPath(0, &trustedAppRef);
</span><span class="cx"> if (status) {
</span><span class="cx"> WTFLogAlways("Cannot create a trusted application object for storing WebCrypto master key, error %d", (int)status);
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> RetainPtr<SecTrustedApplicationRef> trustedApp = adoptCF(trustedAppRef);
</span><span class="cx">
</span><span class="cx"> status = SecACLSetContents(acl, (CFArrayRef)@[ (id)trustedApp.get() ], (CFStringRef)localizedItemName, kSecKeychainPromptRequirePassphase);
</span><span class="cx"> if (status) {
</span><span class="cx"> WTFLogAlways("Cannot set ACL for WebCrypto master key, error %d", (int)status);
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> status = SecItemAdd((CFDictionaryRef)attributes, nullptr);
</span><span class="cx"> if (status) {
</span><span class="cx"> WTFLogAlways("Cannot store WebCrypto master key, error %d", (int)status);
</span><del>- return nullptr;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacWheelEventDeltaFilterMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/WheelEventDeltaFilterMac.mm (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,9 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "config.h"
+
</ins><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx">
</span><del>-#include "config.h"
</del><span class="cx"> #include "WheelEventDeltaFilterMac.h"
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSImmediateActionGestureRecognizerSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSImmediateActionGestureRecognizerSPI.h (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><ins>+#ifndef NSImmediateActionGestureRecognizerSPI_h
+#define NSImmediateActionGestureRecognizerSPI_h
</ins><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx">
</span><span class="lines">@@ -60,3 +62,5 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -93,12 +93,12 @@
</span><span class="cx"> "${WEBCORE_DIR}/html"
</span><span class="cx"> "${WEBCORE_DIR}/html/shadow"
</span><span class="cx"> "${WEBCORE_DIR}/html/track"
</span><ins>+ "${WEBCORE_DIR}/icu"
</ins><span class="cx"> "${WEBCORE_DIR}/inspector"
</span><span class="cx"> "${WEBCORE_DIR}/loader"
</span><span class="cx"> "${WEBCORE_DIR}/loader/archive"
</span><span class="cx"> "${WEBCORE_DIR}/loader/icon"
</span><span class="cx"> "${WEBCORE_DIR}/loader/cache"
</span><del>- "${WEBCORE_DIR}/page"
</del><span class="cx"> "${WEBCORE_DIR}/page/animation"
</span><span class="cx"> "${WEBCORE_DIR}/page/scrolling"
</span><span class="cx"> "${WEBCORE_DIR}/platform"
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
</span><span class="cx"> "${CMAKE_BINARY_DIR}"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source"
</span><ins>+ "${CMAKE_SOURCE_DIR}/WebKitLibraries"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES "")
</span><span class="lines">@@ -769,6 +770,12 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
</span><span class="cx">
</span><ins>+# 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"
+)
+
</ins><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
</span><span class="cx">
</span><span class="cx"> include_directories(${WebKit2_INCLUDE_DIRECTORIES})
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-10-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> NativeContextMenuItem isn't needed anymore, remove it
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformMac.cmake (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,13 @@
</span><span class="cx"> add_definitions(-ObjC++)
</span><span class="cx">
</span><del>-find_library(PDFKIT_FRAMEWORK PDFKit HINTS ${QUARTZ_LIBRARY}/Versions/*/Frameworks)
</del><ins>+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)
</ins><span class="cx">
</span><span class="cx"> find_library(ACCELERATE_LIBRARY accelerate)
</span><span class="cx"> find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
</span><span class="lines">@@ -19,6 +26,8 @@
</span><span class="cx"> find_library(XML2_LIBRARY XML2)
</span><span class="cx"> find_package(ZLIB REQUIRED)
</span><span class="cx">
</span><ins>+add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+
</ins><span class="cx"> list(APPEND WebKit2_LIBRARIES
</span><span class="cx"> ${ACCELERATE_LIBRARY}
</span><span class="cx"> ${AUDIOTOOLBOX_LIBRARY}
</span><span class="lines">@@ -30,7 +39,6 @@
</span><span class="cx"> ${IOKIT_LIBRARY}
</span><span class="cx"> ${IOSURFACE_LIBRARY}
</span><span class="cx"> ${OPENGL_LIBRARY}
</span><del>- ${PDFKIT_FRAMEWORK}/PDFKit
</del><span class="cx"> ${QUARTZ_LIBRARY}
</span><span class="cx"> ${QUARTZCORE_LIBRARY}
</span><span class="cx"> ${SECURITY_LIBRARY}
</span><span class="lines">@@ -48,12 +56,37 @@
</span><span class="cx"> NetworkProcess/mac/NetworkResourceLoaderMac.mm
</span><span class="cx"> NetworkProcess/mac/RemoteNetworkingContext.mm
</span><span class="cx">
</span><ins>+ 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
+
</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="cx"> UIProcess/API/Cocoa/LegacyBundleForClass.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKBackForwardList.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKBackForwardListItem.mm
</span><ins>+ UIProcess/API/Cocoa/WKBrowsingContextController.mm
</ins><span class="cx"> UIProcess/API/Cocoa/WKError.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKFrameInfo.mm
</span><span class="cx"> UIProcess/API/Cocoa/WKNavigation.mm
</span><span class="lines">@@ -130,29 +163,38 @@
</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}/platform/cf"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/mac"
</span><span class="cx"> "${WEBCORE_DIR}/platform/network/cf"
</span><ins>+ "${WEBCORE_DIR}/platform/network/cocoa"
+ "${WEBCORE_DIR}/platform/spi/mac"
+ "${WEBCORE_DIR}/platform/graphics/cg"
</ins><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><span class="cx"> "${WEBKIT2_DIR}/UIProcess/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/API/C/mac"
</span><ins>+ "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
+ "${WEBKIT2_DIR}/UIProcess/API/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/UIProcess/Scrolling"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Platform/IPC/mac"
</span><ins>+ "${WEBKIT2_DIR}/Platform/spi/Cocoa"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/API/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/API/c/cf"
</span><ins>+ "${WEBKIT2_DIR}/Shared/API/c/cg"
+ "${WEBKIT2_DIR}/Shared/API/c/mac"
</ins><span class="cx"> "${WEBKIT2_DIR}/Shared/cf"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Cocoa"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/mac"
</span><span class="cx"> "${WEBKIT2_DIR}/Shared/Plugins/mac"
</span><ins>+ "${WEBKIT2_DIR}/Shared/Scrolling"
</ins><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Plugins/PDF"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/Scrolling"
</span><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><del>- "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore"
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WEBKIT2_EXTRA_DEPENDENCIES
</span><span class="lines">@@ -180,7 +222,20 @@
</span><span class="cx"> UIProcess/API/C/WKPageRenderingProgressEvents.h
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+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
+)
+
</ins><span class="cx"> set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
</span><ins>+ Shared/API/Cocoa
</ins><span class="cx"> Shared/API/c
</span><span class="cx">
</span><span class="cx"> Shared/API/c/mac
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (191472 => 191473)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><del>-#import "WebMemoryPressureHandlerIOS.h"
</del><span class="cx"> #import "WebPageGroup.h"
</span><span class="cx"> #import "WebPreferencesKeys.h"
</span><span class="cx"> #import "WebProcessCreationParameters.h"
</span><span class="lines">@@ -54,6 +53,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "ArgumentCodersCF.h"
</span><ins>+#import "WebMemoryPressureHandlerIOS.h"
</ins><span class="cx"> #import <WebCore/RuntimeApplicationChecksIOS.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <QuartzCore/CARemoteLayerServer.h>
</span></span></pre>
</div>
</div>
</body>
</html>