<!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>[192232] releases/WebKitGTK/webkit-2.10/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/192232">192232</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 05:24:08 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191856">r191856</a> - [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
https://bugs.webkit.org/show_bug.cgi?id=144560
Patch by Philip Chimento <philip.chimento@gmail.com> on 2015-11-01
Reviewed by Darin Adler.
Source/bmalloc:
* PlatformGTK.cmake: Added. This adds Zone.cpp to the PlatformGTK
build, on Darwin only. Since there was previously nothing for the
build system to do that was specific to the GTK platform in
bmalloc, we need to create this file.
Source/WebCore:
* platform/graphics/PlatformDisplay.cpp: Only include the
X11-specific GDK header on PLATFORM(X11). In other cases the
normal gdk.h header is needed, which would otherwise be pulled in
by gdkx.h.
* platform/graphics/opentype/OpenTypeMathData.cpp: Change check
for FourCharCode type from OS(DARWIN) to PLATFORM(COCOA). We
can't remove it altogether because OT_MAKE_TAG doesn't work for
all platforms.
Source/WebKit2:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
Change order of OS(DARWIN) and USE(UNIX_DOMAIN_SOCKETS) checks,
so that we can use Unix domain sockets even on Darwin for the GTK
platform.
* Platform/IPC/Attachment.cpp: Add USE(UNIX_DOMAIN_SOCKETS) check
to OS(DARWIN) check, in order to support GTK platform on OSX.
* Platform/IPC/Attachment.h: Change order of OS(DARWIN) and
USE(UNIX_DOMAIN_SOCKETS) checks throughout.
(IPC::Attachment::size):
(IPC::Attachment::releaseFileDescriptor):
(IPC::Attachment::fileDescriptor):
(IPC::Attachment::disposition):
(IPC::Attachment::port):
* Platform/IPC/Connection.h: Ditto.
(IPC::Connection::identifierIsNull):
(IPC::Connection::Identifier::Identifier):
(IPC::Connection::xpcConnection):
* Platform/IPC/unix/ConnectionUnix.cpp: Only use SOCK_SEQPACKET
if the platform is not GTK, because otherwise the PLATFORM(GTK)
check below is never reached.
* Platform/SharedMemory.h: Change order of OS(DARWIN) and
USE(UNIX_DOMAIN_SOCKETS) checks.
* PluginProcess/PluginProcess.cpp: Ditto.
(WebKit::PluginProcess::createWebProcessConnection):
* Shared/API/c/WKBase.h: Don't include WKBaseMac.h if building
GTK.
* UIProcess/API/C/WKNativeEvent.h: Don't use Apple API if
building GTK.
* UIProcess/Launcher/ProcessLauncher.cpp: Change to
OS(DARWIN) && !PLATFORM(GTK), in the absence of a better platform
macro such as USE(MACH).
(WebKit::ProcessLauncher::didFinishLaunchingProcess):
* UIProcess/Launcher/ProcessLauncher.h: Ditto.
* UIProcess/Network/NetworkProcessProxy.cpp: Change order of
OS(DARWIN) and PLATFORM(GTK) checks.
(WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
(WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess):
* UIProcess/Plugins/PluginProcessProxy.cpp: Ditto.
(WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
(WebKit::PluginProcessProxy::didCreateWebProcessConnection):
* WebProcess/Plugins/PluginProcessConnectionManager.cpp: Ditto.
(WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
* WebProcess/WebPage/WebInspector.cpp: Ditto.
(WebKit::WebInspector::createInspectorPage):
* WebProcess/WebPage/WebInspectorUI.cpp: Ditto.
(WebKit::WebInspectorUI::establishConnection):
* WebProcess/WebProcess.cpp: Ditto.
(WebKit::WebProcess::ensureNetworkProcessConnection):
Source/WTF:
* wtf/Platform.h: Don't USE(ACCELERATE) on PLATFORM(GTK).
* wtf/WorkQueue.h: Change order of OS(DARWIN) and PLATFORM(GTK)
checks so that GTK facilities are used even when building the
GTK platform on Darwin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFChangeLog">releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfPlatformh">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfWorkQueueh">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsPlatformDisplaycpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/PlatformDisplay.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsopentypeOpenTypeMathDatacpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2DatabaseProcessDatabaseProcesscpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2NetworkProcessNetworkProcesscpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCAttachmentcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCAttachmenth">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCConnectionh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCunixConnectionUnixcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PlatformSharedMemoryh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/SharedMemory.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2PluginProcessPluginProcesscpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2SharedAPIcWKBaseh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPICWKNativeEventh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessLauncherProcessLaunchercpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessLauncherProcessLauncherh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessNetworkNetworkProcessProxycpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessPluginsPluginProcessProxycpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageWebInspectorcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageWebInspectorUIcpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebProcesscpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocChangeLog">releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocPlatformGTKcmake">releases/WebKitGTK/webkit-2.10/Source/bmalloc/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-01 Philip Chimento <philip.chimento@gmail.com>
+
+ [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
+ https://bugs.webkit.org/show_bug.cgi?id=144560
+
+ Reviewed by Darin Adler.
+
+ * wtf/Platform.h: Don't USE(ACCELERATE) on PLATFORM(GTK).
+ * wtf/WorkQueue.h: Change order of OS(DARWIN) and PLATFORM(GTK)
+ checks so that GTK facilities are used even when building the
+ GTK platform on Darwin.
+
</ins><span class="cx"> 2015-10-28 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Cannot build the network process in glibc-based BSD systems
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Platform.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Platform.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Platform.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -634,8 +634,10 @@
</span><span class="cx"> #define HAVE_PTHREAD_SETNAME_NP 1
</span><span class="cx"> #define HAVE_READLINE 1
</span><span class="cx"> #define HAVE_SYS_TIMEB_H 1
</span><ins>+
+#if !PLATFORM(GTK)
</ins><span class="cx"> #define USE_ACCELERATE 1
</span><del>-
</del><ins>+#endif
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #define HAVE_HOSTED_CORE_ANIMATION 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !PLATFORM(GTK)
</ins><span class="cx"> #include <dispatch/dispatch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE static void concurrentApply(size_t iterations, const std::function<void (size_t index)>&);
</span><span class="cx">
</span><del>-#if OS(DARWIN)
- dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
-#elif PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> void registerSocketEventHandler(int, std::function<void ()>, std::function<void ()>);
</span><span class="cx"> void unregisterSocketEventHandler(int);
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> void registerSocketEventHandler(int, std::function<void ()>);
</span><span class="cx"> void unregisterSocketEventHandler(int);
</span><ins>+#elif OS(DARWIN)
+ dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -102,16 +102,16 @@
</span><span class="cx"> static DWORD WINAPI unregisterWaitAndDestroyItemCallback(void* context);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN)
- static void executeFunction(void*);
- dispatch_queue_t m_dispatchQueue;
-#elif PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK)
</ins><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> GRefPtr<GMainContext> m_eventContext;
</span><span class="cx"> GRefPtr<GMainLoop> m_eventLoop;
</span><span class="cx"> GMainLoopSource m_socketEventSource;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> RefPtr<DispatchQueue> m_dispatchQueue;
</span><ins>+#elif OS(DARWIN)
+ static void executeFunction(void*);
+ dispatch_queue_t m_dispatchQueue;
</ins><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx"> volatile LONG m_isWorkThreadRegistered;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-01 Philip Chimento <philip.chimento@gmail.com>
+
+ [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
+ https://bugs.webkit.org/show_bug.cgi?id=144560
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/PlatformDisplay.cpp: Only include the
+ X11-specific GDK header on PLATFORM(X11). In other cases the
+ normal gdk.h header is needed, which would otherwise be pulled in
+ by gdkx.h.
+ * platform/graphics/opentype/OpenTypeMathData.cpp: Change check
+ for FourCharCode type from OS(DARWIN) to PLATFORM(COCOA). We
+ can't remove it altogether because OT_MAKE_TAG doesn't work for
+ all platforms.
+
</ins><span class="cx"> 2015-10-31 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer][Mac] Fix WebAudio build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsPlatformDisplaycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/PlatformDisplay.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/PlatformDisplay.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -42,13 +42,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#if PLATFORM(X11)
</del><ins>+#include <gdk/gdk.h>
+#endif
+
+#if PLATFORM(GTK) && PLATFORM(X11)
</ins><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
</del><ins>+
+#if PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
</ins><span class="cx"> #include <gdk/gdkwayland.h>
</span><span class="cx"> #endif
</span><del>-#endif // PLATFORM(GTK)
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL) && defined(HAVE_ECORE_X)
</span><span class="cx"> #include <Ecore_X.h>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformgraphicsopentypeOpenTypeMathDatacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/opentype/OpenTypeMathData.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #if ENABLE(OPENTYPE_MATH)
</span><span class="cx"> namespace OpenType {
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> const FourCharCode MATHTag = 'MATH';
</span><span class="cx"> #else
</span><span class="cx"> const uint32_t MATHTag = OT_MAKE_TAG('M', 'A', 'T', 'H');
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -1,3 +1,60 @@
</span><ins>+2015-11-01 Philip Chimento <philip.chimento@gmail.com>
+
+ [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
+ https://bugs.webkit.org/show_bug.cgi?id=144560
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ Change order of OS(DARWIN) and USE(UNIX_DOMAIN_SOCKETS) checks,
+ so that we can use Unix domain sockets even on Darwin for the GTK
+ platform.
+ * Platform/IPC/Attachment.cpp: Add USE(UNIX_DOMAIN_SOCKETS) check
+ to OS(DARWIN) check, in order to support GTK platform on OSX.
+ * Platform/IPC/Attachment.h: Change order of OS(DARWIN) and
+ USE(UNIX_DOMAIN_SOCKETS) checks throughout.
+ (IPC::Attachment::size):
+ (IPC::Attachment::releaseFileDescriptor):
+ (IPC::Attachment::fileDescriptor):
+ (IPC::Attachment::disposition):
+ (IPC::Attachment::port):
+ * Platform/IPC/Connection.h: Ditto.
+ (IPC::Connection::identifierIsNull):
+ (IPC::Connection::Identifier::Identifier):
+ (IPC::Connection::xpcConnection):
+ * Platform/IPC/unix/ConnectionUnix.cpp: Only use SOCK_SEQPACKET
+ if the platform is not GTK, because otherwise the PLATFORM(GTK)
+ check below is never reached.
+ * Platform/SharedMemory.h: Change order of OS(DARWIN) and
+ USE(UNIX_DOMAIN_SOCKETS) checks.
+ * PluginProcess/PluginProcess.cpp: Ditto.
+ (WebKit::PluginProcess::createWebProcessConnection):
+ * Shared/API/c/WKBase.h: Don't include WKBaseMac.h if building
+ GTK.
+ * UIProcess/API/C/WKNativeEvent.h: Don't use Apple API if
+ building GTK.
+ * UIProcess/Launcher/ProcessLauncher.cpp: Change to
+ OS(DARWIN) && !PLATFORM(GTK), in the absence of a better platform
+ macro such as USE(MACH).
+ (WebKit::ProcessLauncher::didFinishLaunchingProcess):
+ * UIProcess/Launcher/ProcessLauncher.h: Ditto.
+ * UIProcess/Network/NetworkProcessProxy.cpp: Change order of
+ OS(DARWIN) and PLATFORM(GTK) checks.
+ (WebKit::NetworkProcessProxy::networkProcessCrashedOrFailedToLaunch):
+ (WebKit::NetworkProcessProxy::didCreateNetworkConnectionToWebProcess):
+ * UIProcess/Plugins/PluginProcessProxy.cpp: Ditto.
+ (WebKit::PluginProcessProxy::pluginProcessCrashedOrFailedToLaunch):
+ (WebKit::PluginProcessProxy::didCreateWebProcessConnection):
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp: Ditto.
+ (WebKit::PluginProcessConnectionManager::getPluginProcessConnection):
+ * WebProcess/WebPage/WebInspector.cpp: Ditto.
+ (WebKit::WebInspector::createInspectorPage):
+ * WebProcess/WebPage/WebInspectorUI.cpp: Ditto.
+ (WebKit::WebInspectorUI::establishConnection):
+ * WebProcess/WebProcess.cpp: Ditto.
+ (WebKit::WebProcess::ensureNetworkProcessConnection):
+
</ins><span class="cx"> 2015-10-26 Philip Chimento <philip.chimento@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [Stable] InstallMissingMediaPluginsPermissionRequest not defined when building without GStreamer
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -176,7 +176,11 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::createDatabaseToWebProcessConnection()
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
+ m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(socketPair.server));
+ parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
+#elif OS(DARWIN)
</ins><span class="cx"> // Create the listening port.
</span><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="lines">@@ -187,10 +191,6 @@
</span><span class="cx">
</span><span class="cx"> IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
</span><span class="cx"> parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(clientPort), 0);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
- m_databaseToWebProcessConnections.append(DatabaseToWebProcessConnection::create(socketPair.server));
- parentProcessConnection()->send(Messages::DatabaseProcessProxy::DidCreateDatabaseToWebProcessConnection(IPC::Attachment(socketPair.client)), 0);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -233,7 +233,15 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::createNetworkConnectionToWebProcess()
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
+
+ RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(socketPair.server);
+ m_webProcessConnections.append(connection.release());
+
+ IPC::Attachment clientSocket(socketPair.client);
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientSocket), 0);
+#elif OS(DARWIN)
</ins><span class="cx"> // Create the listening port.
</span><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="lines">@@ -244,14 +252,6 @@
</span><span class="cx">
</span><span class="cx"> IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort), 0);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
-
- RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(socketPair.server);
- m_webProcessConnections.append(connection.release());
-
- IPC::Attachment clientSocket(socketPair.client);
- parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientSocket), 0);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCAttachmentcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> Attachment::Attachment(mach_port_name_t port, mach_msg_type_name_t disposition)
</span><span class="cx"> : m_type(MachPortType)
</span><span class="cx"> , m_port(port)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCAttachmenth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Attachment.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef Attachment_h
</span><span class="cx"> #define Attachment_h
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> #include <mach/mach_init.h>
</span><span class="cx"> #include <mach/mach_traps.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -42,38 +42,37 @@
</span><span class="cx">
</span><span class="cx"> enum Type {
</span><span class="cx"> Uninitialized,
</span><del>-#if OS(DARWIN)
- MachPortType,
-#elif USE(UNIX_DOMAIN_SOCKETS)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> SocketType,
</span><del>- MappedMemoryType
</del><ins>+ MappedMemoryType,
+#elif OS(DARWIN)
+ MachPortType
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if OS(DARWIN)
- Attachment(mach_port_name_t port, mach_msg_type_name_t disposition);
-#elif USE(UNIX_DOMAIN_SOCKETS)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> Attachment(Attachment&&);
</span><span class="cx"> Attachment& operator=(Attachment&&);
</span><span class="cx"> Attachment(int fileDescriptor, size_t);
</span><span class="cx"> Attachment(int fileDescriptor);
</span><span class="cx"> ~Attachment();
</span><ins>+#elif OS(DARWIN)
+ Attachment(mach_port_name_t, mach_msg_type_name_t disposition);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Type type() const { return m_type; }
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ size_t size() const { return m_size; }
+
+ int releaseFileDescriptor() { int temp = m_fileDescriptor; m_fileDescriptor = -1; return temp; }
+ int fileDescriptor() const { return m_fileDescriptor; }
+#elif OS(DARWIN)
</ins><span class="cx"> void release();
</span><span class="cx">
</span><span class="cx"> // MachPortType
</span><span class="cx"> mach_port_name_t port() const { return m_port; }
</span><span class="cx"> mach_msg_type_name_t disposition() const { return m_disposition; }
</span><del>-
-#elif USE(UNIX_DOMAIN_SOCKETS)
- size_t size() const { return m_size; }
-
- int releaseFileDescriptor() { int temp = m_fileDescriptor; m_fileDescriptor = -1; return temp; }
- int fileDescriptor() const { return m_fileDescriptor; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void encode(ArgumentEncoder&) const;
</span><span class="lines">@@ -82,12 +81,12 @@
</span><span class="cx"> private:
</span><span class="cx"> Type m_type;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
- mach_port_name_t m_port;
- mach_msg_type_name_t m_disposition;
-#elif USE(UNIX_DOMAIN_SOCKETS)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> int m_fileDescriptor { -1 };
</span><span class="cx"> size_t m_size;
</span><ins>+#elif OS(DARWIN)
+ mach_port_name_t m_port;
+ mach_msg_type_name_t m_disposition;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Connection.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Connection.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/Connection.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> #include <mach/mach_port.h>
</span><span class="cx"> #include <wtf/OSObjectPtr.h>
</span><span class="cx"> #include <wtf/spi/darwin/XPCSPI.h>
</span><span class="lines">@@ -99,7 +99,22 @@
</span><span class="cx"> class WorkQueueMessageReceiver : public MessageReceiver, public ThreadSafeRefCounted<WorkQueueMessageReceiver> {
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ typedef int Identifier;
+ static bool identifierIsNull(Identifier identifier) { return identifier == -1; }
+
+ struct SocketPair {
+ int client;
+ int server;
+ };
+
+ enum ConnectionOptions {
+ SetCloexecOnClient = 1 << 0,
+ SetCloexecOnServer = 1 << 1,
+ };
+
+ static Connection::SocketPair createPlatformConnection(unsigned options = SetCloexecOnClient | SetCloexecOnServer);
+#elif OS(DARWIN)
</ins><span class="cx"> struct Identifier {
</span><span class="cx"> Identifier()
</span><span class="cx"> : port(MACH_PORT_NULL)
</span><span class="lines">@@ -124,21 +139,6 @@
</span><span class="cx"> xpc_connection_t xpcConnection() const { return m_xpcConnection.get(); }
</span><span class="cx"> bool getAuditToken(audit_token_t&);
</span><span class="cx"> pid_t remoteProcessID() const;
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- typedef int Identifier;
- static bool identifierIsNull(Identifier identifier) { return identifier == -1; }
-
- struct SocketPair {
- int client;
- int server;
- };
-
- enum ConnectionOptions {
- SetCloexecOnClient = 1 << 0,
- SetCloexecOnServer = 1 << 1,
- };
-
- static Connection::SocketPair createPlatformConnection(unsigned options = SetCloexecOnClient | SetCloexecOnServer);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static Ref<Connection> createServerConnection(Identifier, Client&);
</span><span class="lines">@@ -317,8 +317,18 @@
</span><span class="cx"> bool m_shouldBoostMainThreadOnSyncMessage { false };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> // Called on the connection queue.
</span><ins>+ void readyReadHandler();
+ bool processMessage();
+
+ Vector<uint8_t> m_readBuffer;
+ size_t m_readBufferSize;
+ Vector<int> m_fileDescriptors;
+ size_t m_fileDescriptorsSize;
+ int m_socketDescriptor;
+#elif OS(DARWIN)
+ // Called on the connection queue.
</ins><span class="cx"> void receiveSourceEventHandler();
</span><span class="cx"> void initializeDeadNameSource();
</span><span class="cx">
</span><span class="lines">@@ -338,17 +348,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> OSObjectPtr<xpc_connection_t> m_xpcConnection;
</span><del>-
-#elif USE(UNIX_DOMAIN_SOCKETS)
- // Called on the connection queue.
- void readyReadHandler();
- bool processMessage();
-
- Vector<uint8_t> m_readBuffer;
- size_t m_readBufferSize;
- Vector<int> m_fileDescriptors;
- size_t m_fileDescriptorsSize;
- int m_socketDescriptor;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifdef SOCK_SEQPACKET
</del><ins>+#if defined(SOCK_SEQPACKET)
</ins><span class="cx"> #define SOCKET_TYPE SOCK_SEQPACKET
</span><span class="cx"> #else
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/SharedMemory.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/SharedMemory.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Platform/SharedMemory.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -74,11 +74,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> private:
</span><span class="cx"> friend class SharedMemory;
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ mutable IPC::Attachment m_attachment;
+#elif OS(DARWIN)
</ins><span class="cx"> mutable mach_port_t m_port;
</span><span class="cx"> size_t m_size;
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- mutable IPC::Attachment m_attachment;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> void* m_data;
</span><span class="cx"> Protection m_protection;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
- mach_port_t m_port;
-#elif USE(UNIX_DOMAIN_SOCKETS)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> int m_fileDescriptor;
</span><span class="cx"> bool m_isWrappingMap { false };
</span><ins>+#elif OS(DARWIN)
+ mach_port_t m_port;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2PluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/PluginProcess/PluginProcess.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/PluginProcess/PluginProcess.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -148,7 +148,15 @@
</span><span class="cx"> {
</span><span class="cx"> bool didHaveAnyWebProcessConnections = !m_webProcessConnections.isEmpty();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
+
+ RefPtr<WebProcessConnection> connection = WebProcessConnection::create(socketPair.server);
+ m_webProcessConnections.append(connection.release());
+
+ IPC::Attachment clientSocket(socketPair.client);
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization), 0);
+#elif OS(DARWIN)
</ins><span class="cx"> // Create the listening port.
</span><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="lines">@@ -167,14 +175,6 @@
</span><span class="cx">
</span><span class="cx"> IPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
</span><span class="cx"> parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort, m_supportsAsynchronousPluginInitialization), 0);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
-
- RefPtr<WebProcessConnection> connection = WebProcessConnection::create(socketPair.server);
- m_webProcessConnections.append(connection.release());
-
- IPC::Attachment clientSocket(socketPair.client);
- parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization), 0);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/API/c/WKBase.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/API/c/WKBase.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/Shared/API/c/WKBase.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <WebKit/WKBaseEfl.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__APPLE__)
</del><ins>+#if defined(__APPLE__) && !defined(BUILDING_GTK__)
</ins><span class="cx"> #include <WebKit/WKBaseMac.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessAPICWKNativeEventh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__APPLE__) && !TARGET_OS_IPHONE
</del><ins>+#if defined(__APPLE__) && !TARGET_OS_IPHONE && !defined(BUILDING_GTK__)
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> @class NSEvent;
</span><span class="cx"> #elif __cplusplus
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -133,10 +133,10 @@
</span><span class="cx"> while (!m_pendingConnectionReplies.isEmpty()) {
</span><span class="cx"> auto reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(IPC::Attachment());
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(IPC::Attachment());
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span><span class="lines">@@ -168,10 +168,10 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(connectionIdentifier);
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(connectionIdentifier);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -58,7 +58,8 @@
</span><span class="cx">
</span><span class="cx"> if (!m_client) {
</span><span class="cx"> // FIXME: Make Identifier a move-only object and release port rights/connections in the destructor.
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !PLATFORM(GTK)
+ // FIXME: Should really be something like USE(MACH)
</ins><span class="cx"> if (identifier.port)
</span><span class="cx"> mach_port_mod_refs(mach_task_self(), identifier.port, MACH_PORT_RIGHT_RECEIVE, -1);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> struct LaunchOptions {
</span><span class="cx"> ProcessType processType;
</span><span class="cx"> HashMap<String, String> extraInitializationData;
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !PLATFORM(GTK)
</ins><span class="cx"> static const cpu_type_t MatchCurrentArchitecture = 0;
</span><span class="cx"> cpu_type_t architecture;
</span><span class="cx"> bool executableHeap;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -169,10 +169,10 @@
</span><span class="cx"> while (!m_pendingConnectionReplies.isEmpty()) {
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(IPC::Attachment());
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(IPC::Attachment());
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span><span class="lines">@@ -235,10 +235,10 @@
</span><span class="cx"> // Grab the first pending connection reply.
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(connectionIdentifier);
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND));
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(connectionIdentifier);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -154,10 +154,10 @@
</span><span class="cx"> while (!m_pendingConnectionReplies.isEmpty()) {
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(IPC::Attachment(), false);
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND), false);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(IPC::Attachment(), false);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span><span class="lines">@@ -268,10 +268,10 @@
</span><span class="cx"> // Grab the first pending connection reply.
</span><span class="cx"> RefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply = m_pendingConnectionReplies.takeFirst();
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(connectionIdentifier, supportsAsynchronousPluginInitialization);
+#elif OS(DARWIN)
</ins><span class="cx"> reply->send(IPC::Attachment(connectionIdentifier.port(), MACH_MSG_TYPE_MOVE_SEND), supportsAsynchronousPluginInitialization);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- reply->send(connectionIdentifier, supportsAsynchronousPluginInitialization);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if OS(DARWIN) && !USE(UNIX_DOMAIN_SOCKETS)
</ins><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -74,10 +74,10 @@
</span><span class="cx"> Messages::WebProcessProxy::GetPluginProcessConnection::Reply(encodedConnectionIdentifier, supportsAsynchronousInitialization), 0))
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
+#elif OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
</del><span class="cx"> #endif
</span><span class="cx"> if (IPC::Connection::identifierIsNull(connectionIdentifier))
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -72,16 +72,16 @@
</span><span class="cx"> // Called from WebInspectorClient
</span><span class="cx"> void WebInspector::createInspectorPage(bool underTest)
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
+ IPC::Connection::Identifier connectionIdentifier(socketPair.server);
+ IPC::Attachment connectionClientPort(socketPair.client);
+#elif OS(DARWIN)
</ins><span class="cx"> mach_port_t listeningPort;
</span><span class="cx"> mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);
</span><span class="cx">
</span><span class="cx"> IPC::Connection::Identifier connectionIdentifier(listeningPort);
</span><span class="cx"> IPC::Attachment connectionClientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::SocketPair socketPair = IPC::Connection::createPlatformConnection();
- IPC::Connection::Identifier connectionIdentifier(socketPair.server);
- IPC::Attachment connectionClientPort(socketPair.client);
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebPageWebInspectorUIcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -63,10 +63,10 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorUI::establishConnection(IPC::Attachment encodedConnectionIdentifier, uint64_t inspectedPageIdentifier, bool underTest)
</span><span class="cx"> {
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.releaseFileDescriptor());
+#elif OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.releaseFileDescriptor());
</del><span class="cx"> #else
</span><span class="cx"> notImplemented();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -409,10 +409,10 @@
</span><span class="cx"> Messages::WebProcessProxy::GetNetworkProcessConnection::Reply(encodedConnectionIdentifier), 0))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
+#elif OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
</del><span class="cx"> #else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #endif
</span><span class="lines">@@ -1083,10 +1083,10 @@
</span><span class="cx"> Messages::WebProcessProxy::GetDatabaseProcessConnection::Reply(encodedConnectionIdentifier), 0))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if OS(DARWIN)
</del><ins>+#if USE(UNIX_DOMAIN_SOCKETS)
+ IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
+#elif OS(DARWIN)
</ins><span class="cx"> IPC::Connection::Identifier connectionIdentifier(encodedConnectionIdentifier.port());
</span><del>-#elif USE(UNIX_DOMAIN_SOCKETS)
- IPC::Connection::Identifier connectionIdentifier = encodedConnectionIdentifier.releaseFileDescriptor();
</del><span class="cx"> #else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog (192231 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog 2015-11-10 12:54:01 UTC (rev 192231)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-01 Philip Chimento <philip.chimento@gmail.com>
+
+ [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
+ https://bugs.webkit.org/show_bug.cgi?id=144560
+
+ Reviewed by Darin Adler.
+
+ * PlatformGTK.cmake: Added. This adds Zone.cpp to the PlatformGTK
+ build, on Darwin only. Since there was previously nothing for the
+ build system to do that was specific to the GTK platform in
+ bmalloc, we need to create this file.
+
</ins><span class="cx"> 2015-10-29 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc: AsyncTask should handle destruction
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocPlatformGTKcmake"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/Source/bmalloc/PlatformGTK.cmake (0 => 192232)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/PlatformGTK.cmake (rev 0)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/PlatformGTK.cmake 2015-11-10 13:24:08 UTC (rev 192232)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ list(APPEND bmalloc_SOURCES
+ bmalloc/Zone.cpp
+ )
+endif ()
</ins></span></pre>
</div>
</div>
</body>
</html>