<!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>[196661] trunk/Source/WebKit2</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/196661">196661</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-16 14:57:01 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use pid_t everywhere, instead of PlatformProcessIdentifier
https://bugs.webkit.org/show_bug.cgi?id=154306
Reviewed by Sam Weinig.
* Platform/IPC/Connection.h:
* Platform/PlatformProcessIdentifier.h: Removed.
* UIProcess/API/efl/tests/test_ewk2_context.cpp:
(TEST_F):
* UIProcess/ChildProcessProxy.h:
(WebKit::ChildProcessProxy::processIdentifier):
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::didFinishLaunchingProcess):
* UIProcess/Launcher/ProcessLauncher.h:
(WebKit::ProcessLauncher::processIdentifier):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::processIdentifier):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::networkProcessIdentifier):
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessProxy.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessChildProcessProxyh">trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2PlatformPlatformProcessIdentifierh">trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-02-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Use pid_t everywhere, instead of PlatformProcessIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=154306
+
+ Reviewed by Sam Weinig.
+
+ * Platform/IPC/Connection.h:
+ * Platform/PlatformProcessIdentifier.h: Removed.
+ * UIProcess/API/efl/tests/test_ewk2_context.cpp:
+ (TEST_F):
+ * UIProcess/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::processIdentifier):
+ * UIProcess/Launcher/ProcessLauncher.cpp:
+ (WebKit::ProcessLauncher::didFinishLaunchingProcess):
+ * UIProcess/Launcher/ProcessLauncher.h:
+ (WebKit::ProcessLauncher::processIdentifier):
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::processIdentifier):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::networkProcessIdentifier):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2016-02-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove WebKit2 header cruft
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154309
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -48,10 +48,6 @@
</span><span class="cx"> #include <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
-#include "PlatformProcessIdentifier.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include "GSocketMonitor.h"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformPlatformProcessIdentifierh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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.
- */
-
-
-#ifndef PlatformProcessIdentifier_h
-#define PlatformProcessIdentifier_h
-
-#if PLATFORM(EFL)
-#include <unistd.h>
-#endif
-
-namespace WebKit {
-
-#if PLATFORM(COCOA)
-typedef pid_t PlatformProcessIdentifier;
-#elif PLATFORM(GTK)
-typedef int PlatformProcessIdentifier;
-#elif PLATFORM(EFL)
-typedef pid_t PlatformProcessIdentifier;
-#endif
-
-} // namespace WebKit
-
-#endif // PlatformProcessIdentifier_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -184,8 +184,8 @@
</span><span class="cx"> Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx"> Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx">
</span><del>- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</del><ins>+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT_EQ(webView1WebProcessID, webView2WebProcessID);
</span><span class="cx"> }
</span><span class="lines">@@ -203,8 +203,8 @@
</span><span class="cx"> Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx"> Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx">
</span><del>- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</del><ins>+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT_NE(webView1WebProcessID, webView2WebProcessID);
</span><span class="cx"> }
</span><span class="lines">@@ -222,13 +222,13 @@
</span><span class="cx"> Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx"> Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx">
</span><del>- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</del><ins>+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT_EQ(webView1WebProcessID, webView2WebProcessID);
</span><span class="cx">
</span><del>- PlatformProcessIdentifier webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
- PlatformProcessIdentifier webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
</del><ins>+ pid_t webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
+ pid_t webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
</ins><span class="cx">
</span><span class="cx"> ASSERT_EQ(webView1NetworkProcessID, webView2NetworkProcessID);
</span><span class="cx"> }
</span><span class="lines">@@ -246,10 +246,10 @@
</span><span class="cx"> Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx"> Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
</span><span class="cx">
</span><del>- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
- PlatformProcessIdentifier webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
</del><ins>+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
+ pid_t webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
+ pid_t webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
</ins><span class="cx">
</span><span class="cx"> if (!webView1WebProcessID || !webView2WebProcessID)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessChildProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> };
</span><span class="cx"> State state() const;
</span><span class="cx">
</span><del>- PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
</del><ins>+ pid_t processIdentifier() const { return m_processLauncher->processIdentifier(); }
</ins><span class="cx">
</span><span class="cx"> bool canSendMessage() const { return state() != State::Terminated;}
</span><span class="cx"> bool sendMessage(std::unique_ptr<IPC::MessageEncoder>, unsigned messageSendFlags);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProcessLauncher::didFinishLaunchingProcess(PlatformProcessIdentifier processIdentifier, IPC::Connection::Identifier identifier)
</del><ins>+void ProcessLauncher::didFinishLaunchingProcess(pid_t processIdentifier, IPC::Connection::Identifier identifier)
</ins><span class="cx"> {
</span><span class="cx"> m_processIdentifier = processIdentifier;
</span><span class="cx"> m_isLaunching = false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define WebProcessLauncher_h
</span><span class="cx">
</span><span class="cx"> #include "Connection.h"
</span><del>-#include "PlatformProcessIdentifier.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="lines">@@ -72,7 +71,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isLaunching() const { return m_isLaunching; }
</span><del>- PlatformProcessIdentifier processIdentifier() const { return m_processIdentifier; }
</del><ins>+ pid_t processIdentifier() const { return m_processIdentifier; }
</ins><span class="cx">
</span><span class="cx"> void terminateProcess();
</span><span class="cx"> void invalidate();
</span><span class="lines">@@ -81,7 +80,7 @@
</span><span class="cx"> ProcessLauncher(Client*, const LaunchOptions& launchOptions);
</span><span class="cx">
</span><span class="cx"> void launchProcess();
</span><del>- void didFinishLaunchingProcess(PlatformProcessIdentifier, IPC::Connection::Identifier);
</del><ins>+ void didFinishLaunchingProcess(pid_t, IPC::Connection::Identifier);
</ins><span class="cx">
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span><span class="lines">@@ -89,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> const LaunchOptions m_launchOptions;
</span><span class="cx"> bool m_isLaunching;
</span><del>- PlatformProcessIdentifier m_processIdentifier;
</del><ins>+ pid_t m_processIdentifier;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(PlatformProcessIdentifier, IPC::Connection::Identifier);
</del><ins>+typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(pid_t, IPC::Connection::Identifier);
</ins><span class="cx">
</span><span class="cx"> static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> return m_configuration.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PlatformProcessIdentifier WebPageProxy::processIdentifier() const
</del><ins>+pid_t WebPageProxy::processIdentifier() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_isClosed)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "NotificationPermissionRequestManagerProxy.h"
</span><span class="cx"> #include "PageLoadState.h"
</span><del>-#include "PlatformProcessIdentifier.h"
</del><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="lines">@@ -836,7 +835,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebProcessProxy& process() { return m_process; }
</span><del>- PlatformProcessIdentifier processIdentifier() const;
</del><ins>+ pid_t processIdentifier() const;
</ins><span class="cx">
</span><span class="cx"> WebPreferences& preferences() { return m_preferences; }
</span><span class="cx"> void setPreferences(WebPreferences&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
</del><ins>+pid_t WebProcessPool::networkProcessIdentifier()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_networkProcess)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- PlatformProcessIdentifier networkProcessIdentifier();
</del><ins>+ pid_t networkProcessIdentifier();
</ins><span class="cx">
</span><span class="cx"> void setAlwaysUsesComplexTextCodePath(bool);
</span><span class="cx"> void setShouldUseFontSmoothing(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx"> #include "MessageReceiverMap.h"
</span><del>-#include "PlatformProcessIdentifier.h"
</del><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><span class="cx"> #include "ProcessThrottlerClient.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196660 => 196661)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-16 22:54:26 UTC (rev 196660)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-16 22:57:01 UTC (rev 196661)
</span><span class="lines">@@ -1513,7 +1513,6 @@
</span><span class="cx"> BC8699B5116AADAA002A925B /* WKView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B2116AADAA002A925B /* WKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC8699B6116AADAA002A925B /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8699B3116AADAA002A925B /* WKView.mm */; };
</span><span class="cx"> BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B4116AADAA002A925B /* WKViewInternal.h */; };
</span><del>- BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */; };
</del><span class="cx"> BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8A501411765F5600757573 /* WKRetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */; };
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8ACA1016670D7B004C1941 /* ObjCObjectGraph.mm */; };
</span><span class="lines">@@ -3568,7 +3567,6 @@
</span><span class="cx"> BC8699B2116AADAA002A925B /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKView.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8699B3116AADAA002A925B /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKView.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC8699B4116AADAA002A925B /* WKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewInternal.h; sourceTree = "<group>"; };
</span><del>- BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformProcessIdentifier.h; sourceTree = "<group>"; };
</del><span class="cx"> BC87DFA91018101400564216 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
</span><span class="cx"> BC8A501411765F5600757573 /* WKRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRetainPtr.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCObjectGraph.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6408,7 +6406,6 @@
</span><span class="cx"> 51A7F2F2125BF820008AEB1D /* Logging.h */,
</span><span class="cx"> C0E3AA451209E2BA00A49D01 /* Module.cpp */,
</span><span class="cx"> C0E3AA441209E2BA00A49D01 /* Module.h */,
</span><del>- BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */,
</del><span class="cx"> 1A24BED3120894D100FBB059 /* SharedMemory.h */,
</span><span class="cx"> );
</span><span class="cx"> path = Platform;
</span><span class="lines">@@ -7472,7 +7469,6 @@
</span><span class="cx"> 2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */,
</span><span class="cx"> 2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */,
</span><span class="cx"> BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */,
</span><del>- BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */,
</del><span class="cx"> 1A6FB7D311E651E200DB1371 /* Plugin.h in Headers */,
</span><span class="cx"> 31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */,
</span><span class="cx"> 1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>