[Win] WTF: Add alias for process id to use in place of direct uses of pid_t
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2017 02:55:06 +0000 (02:55 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Sep 2017 02:55:06 +0000 (02:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=177017

Patch by Stephan Szabo <stephan.szabo@sony.com> on 2017-09-20
Reviewed by Alex Christensen.

Source/JavaScriptCore:

* API/JSRemoteInspector.cpp:
(JSRemoteInspectorSetParentProcessInformation):
* API/JSRemoteInspector.h:
* inspector/remote/RemoteInspector.h:

Source/WebKit:

* NetworkProcess/NetworkProcessCreationParameters.h:
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextGetNetworkProcessIdentifier):
(WKContextGetDatabaseProcessIdentifier):
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetProcessIdentifier):
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/ChildProcessProxy.h:
(WebKit::ChildProcessProxy::processIdentifier const):
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::didFinishLaunchingProcess):
* UIProcess/Launcher/ProcessLauncher.h:
(WebKit::ProcessLauncher::processIdentifier const):
* UIProcess/ProcessAssertion.cpp:
(WebKit::ProcessAssertion::ProcessAssertion):
(WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):
* UIProcess/ProcessAssertion.h:
(WebKit::ProcessAssertion::ProcessAssertion):
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::didConnectToProcess):
* UIProcess/ProcessThrottler.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::processIdentifier const):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::networkProcessIdentifier):
(WebKit::WebProcessPool::storageProcessIdentifier):
* UIProcess/WebProcessPool.h:

Source/WTF:

* wtf/ProcessID.h:
(WTF::getCurrentProcessID):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@222309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

25 files changed:
Source/JavaScriptCore/API/JSRemoteInspector.cpp
Source/JavaScriptCore/API/JSRemoteInspector.h
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/remote/RemoteInspector.h
Source/WTF/ChangeLog
Source/WTF/wtf/ProcessID.h
Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
Source/WebKit/Shared/WebProcessCreationParameters.h
Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
Source/WebKit/UIProcess/API/C/WKContext.cpp
Source/WebKit/UIProcess/API/C/WKContextPrivate.h
Source/WebKit/UIProcess/API/C/WKPage.cpp
Source/WebKit/UIProcess/API/C/WKPagePrivate.h
Source/WebKit/UIProcess/ChildProcessProxy.h
Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp
Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit/UIProcess/ProcessAssertion.cpp
Source/WebKit/UIProcess/ProcessAssertion.h
Source/WebKit/UIProcess/ProcessThrottler.cpp
Source/WebKit/UIProcess/ProcessThrottler.h
Source/WebKit/UIProcess/WebPageProxy.cpp
Source/WebKit/UIProcess/WebPageProxy.h
Source/WebKit/UIProcess/WebProcessPool.cpp
Source/WebKit/UIProcess/WebProcessPool.h

index 3be61d0..9672ef0 100644 (file)
@@ -27,6 +27,7 @@
 #include "JSRemoteInspector.h"
 
 #include "JSGlobalObjectConsoleClient.h"
+#include <wtf/ProcessID.h>
 
 #if ENABLE(REMOTE_INSPECTOR)
 #include "RemoteInspector.h"
@@ -50,7 +51,7 @@ void JSRemoteInspectorStart(void)
 #endif
 }
 
-void JSRemoteInspectorSetParentProcessInformation(pid_t pid, const uint8_t* auditData, size_t auditLength)
+void JSRemoteInspectorSetParentProcessInformation(ProcessID pid, const uint8_t* auditData, size_t auditLength)
 {
 #if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
     RetainPtr<CFDataRef> auditDataRef = adoptCF(CFDataCreate(kCFAllocatorDefault, auditData, auditLength));
index 4f86510..c8bac6d 100644 (file)
 #include <JavaScriptCore/JSBase.h>
 #include <JavaScriptCore/WebKitAvailability.h>
 
+#if defined(WIN32) || defined(_WIN32)
+typedef int JSProcessID;
+#else
 #include <unistd.h>
+typedef pid_t JSProcessID;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,7 +42,7 @@ extern "C" {
 
 JS_EXPORT void JSRemoteInspectorDisableAutoStart(void) CF_AVAILABLE(10_11, 9_0);
 JS_EXPORT void JSRemoteInspectorStart(void) CF_AVAILABLE(10_11, 9_0);
-JS_EXPORT void JSRemoteInspectorSetParentProcessInformation(pid_t, const uint8_t* auditData, size_t auditLength) CF_AVAILABLE(10_11, 9_0);
+JS_EXPORT void JSRemoteInspectorSetParentProcessInformation(JSProcessID, const uint8_t* auditData, size_t auditLength) CF_AVAILABLE(10_11, 9_0);
 
 JS_EXPORT void JSRemoteInspectorSetLogToSystemConsole(bool) CF_AVAILABLE(10_11, 9_0);
 
index f2d564c..841cb43 100644 (file)
@@ -1,3 +1,15 @@
+2017-09-20  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win] WTF: Add alias for process id to use in place of direct uses of pid_t
+        https://bugs.webkit.org/show_bug.cgi?id=177017
+
+        Reviewed by Alex Christensen.
+
+        * API/JSRemoteInspector.cpp:
+        (JSRemoteInspectorSetParentProcessInformation):
+        * API/JSRemoteInspector.h:
+        * inspector/remote/RemoteInspector.h:
+
 2017-09-20  Keith Miller  <keith_miller@apple.com>
 
         Rename source list file to Sources.txt
index d00de2b..6ae7c09 100644 (file)
@@ -30,6 +30,7 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Lock.h>
+#include <wtf/ProcessID.h>
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(COCOA)
@@ -108,9 +109,9 @@ public:
 
 #if PLATFORM(COCOA)
     bool hasParentProcessInformation() const { return m_parentProcessIdentifier != 0; }
-    pid_t parentProcessIdentifier() const { return m_parentProcessIdentifier; }
+    ProcessID parentProcessIdentifier() const { return m_parentProcessIdentifier; }
     RetainPtr<CFDataRef> parentProcessAuditData() const { return m_parentProcessAuditData; }
-    void setParentProcessInformation(pid_t, RetainPtr<CFDataRef> auditData);
+    void setParentProcessInformation(ProcessID, RetainPtr<CFDataRef> auditData);
     void setParentProcessInfomationIsDelayed();
 #endif
 
@@ -207,7 +208,7 @@ private:
     bool m_hasActiveDebugSession { false };
     bool m_pushScheduled { false };
 
-    pid_t m_parentProcessIdentifier { 0 };
+    ProcessID m_parentProcessIdentifier { 0 };
 #if PLATFORM(COCOA)
     RetainPtr<CFDataRef> m_parentProcessAuditData;
 #endif
index da2a3e6..8342f9f 100644 (file)
@@ -1,3 +1,13 @@
+2017-09-20  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win] WTF: Add alias for process id to use in place of direct uses of pid_t
+        https://bugs.webkit.org/show_bug.cgi?id=177017
+
+        Reviewed by Alex Christensen.
+
+        * wtf/ProcessID.h:
+        (WTF::getCurrentProcessID):
+
 2017-09-20  Keith Miller  <keith_miller@apple.com>
 
         JSC Xcode build should use unified sources for platform independent files
index f84716e..ccdc2e0 100644 (file)
 
 namespace WTF {
 
-inline int getCurrentProcessID()
+#if OS(WINDOWS)
+using ProcessID = int;
+#else
+using ProcessID = pid_t;
+#endif
+
+inline ProcessID getCurrentProcessID()
 {
 #if OS(WINDOWS)
     return GetCurrentProcessId();
@@ -48,6 +54,7 @@ inline int getCurrentProcessID()
 } // namespace WTF
 
 using WTF::getCurrentProcessID;
+using WTF::ProcessID;
 
 #endif // ProcessID_h
 
index bdfc0c1..5bb8e7b 100644 (file)
@@ -1,3 +1,42 @@
+2017-09-20  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win] WTF: Add alias for process id to use in place of direct uses of pid_t
+        https://bugs.webkit.org/show_bug.cgi?id=177017
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/NetworkProcessCreationParameters.h:
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextGetNetworkProcessIdentifier):
+        (WKContextGetDatabaseProcessIdentifier):
+        * UIProcess/API/C/WKContextPrivate.h:
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageGetProcessIdentifier):
+        * UIProcess/API/C/WKPagePrivate.h:
+        * UIProcess/ChildProcessProxy.h:
+        (WebKit::ChildProcessProxy::processIdentifier const):
+        * UIProcess/Launcher/ProcessLauncher.cpp:
+        (WebKit::ProcessLauncher::didFinishLaunchingProcess):
+        * UIProcess/Launcher/ProcessLauncher.h:
+        (WebKit::ProcessLauncher::processIdentifier const):
+        * UIProcess/ProcessAssertion.cpp:
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        (WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):
+        * UIProcess/ProcessAssertion.h:
+        (WebKit::ProcessAssertion::ProcessAssertion):
+        * UIProcess/ProcessThrottler.cpp:
+        (WebKit::ProcessThrottler::didConnectToProcess):
+        * UIProcess/ProcessThrottler.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::processIdentifier const):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::networkProcessIdentifier):
+        (WebKit::WebProcessPool::storageProcessIdentifier):
+        * UIProcess/WebProcessPool.h:
+
 2017-09-20  Chris Dumez  <cdumez@apple.com>
 
         [WK2] Add API to get the redirect chain of a WKDownload
index 1eb7979..d0a32db 100644 (file)
@@ -28,6 +28,7 @@
 #include "Attachment.h"
 #include "CacheModel.h"
 #include "SandboxExtension.h"
+#include <wtf/ProcessID.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
@@ -78,7 +79,7 @@ struct NetworkProcessCreationParameters {
     Seconds loadThrottleLatency;
 
     Vector<String> urlSchemesRegisteredForCustomProtocols;
-    pid_t presentingApplicationPID { 0 };
+    ProcessID presentingApplicationPID { 0 };
 
 #if PLATFORM(COCOA)
     String parentProcessName;
index 56185ab..0e23c4b 100644 (file)
@@ -30,6 +30,7 @@
 #include "TextCheckerState.h"
 #include "UserData.h"
 #include <pal/SessionID.h>
+#include <wtf/ProcessID.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
@@ -136,7 +137,7 @@ struct WebProcessCreationParameters {
     String uiProcessBundleIdentifier;
 #endif
 
-    pid_t presentingApplicationPID { 0 };
+    ProcessID presentingApplicationPID { 0 };
 
 #if PLATFORM(COCOA)
     WebCore::MachSendRight acceleratedCompositingPort;
index 0ac7cc6..d8323ff 100644 (file)
@@ -138,8 +138,8 @@ public:
     void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
 #endif
 
-    pid_t presentingApplicationPID() const { return m_presentingApplicationPID; }
-    void setPresentingApplicationPID(pid_t pid) { m_presentingApplicationPID = pid; }
+    ProcessID presentingApplicationPID() const { return m_presentingApplicationPID; }
+    void setPresentingApplicationPID(ProcessID pid) { m_presentingApplicationPID = pid; }
 
 private:
     bool m_shouldHaveLegacyDataStore { false };
@@ -173,7 +173,7 @@ private:
     bool m_alwaysRunsAtBackgroundPriority { false };
     bool m_shouldTakeUIBackgroundAssertion { true };
     bool m_shouldCaptureAudioInUIProcess { false };
-    pid_t m_presentingApplicationPID { getCurrentProcessID() };
+    ProcessID m_presentingApplicationPID { getCurrentProcessID() };
 #if PLATFORM(IOS)
     WTF::String m_ctDataConnectionServiceType;
 #endif
index 05a4ef9..78338ed 100644 (file)
@@ -599,12 +599,12 @@ void WKContextTerminateNetworkProcess(WKContextRef context)
     toImpl(context)->terminateNetworkProcess();
 }
 
-pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
+ProcessID WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
 {
     return toImpl(contextRef)->networkProcessIdentifier();
 }
 
-pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
+ProcessID WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
 {
     return toImpl(contextRef)->storageProcessIdentifier();
 }
index fe8788d..02f90b9 100644 (file)
 #include <WebKit/WKBase.h>
 #include <WebKit/WKContext.h>
 
+#if defined(WIN32) || defined(_WIN32)
+typedef int WKProcessID;
+#else
 #include <unistd.h>
+typedef pid_t WKProcessID;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,8 +105,8 @@ WK_EXPORT void WKContextSetMemoryCacheDisabled(WKContextRef, bool disabled);
 
 WK_EXPORT void WKContextSetFontWhitelist(WKContextRef, WKArrayRef);
 
-WK_EXPORT pid_t WKContextGetNetworkProcessIdentifier(WKContextRef context);
-WK_EXPORT pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef context);
+WK_EXPORT WKProcessID WKContextGetNetworkProcessIdentifier(WKContextRef context);
+WK_EXPORT WKProcessID WKContextGetDatabaseProcessIdentifier(WKContextRef context);
 
 #ifdef __cplusplus
 }
index 82dd3e1..1088612 100644 (file)
@@ -2741,7 +2741,7 @@ void WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportSca
 #endif
 }
 
-pid_t WKPageGetProcessIdentifier(WKPageRef page)
+ProcessID WKPageGetProcessIdentifier(WKPageRef page)
 {
     return toImpl(page)->processIdentifier();
 }
index 8717468..0df8364 100644 (file)
 #include <WebKit/WKBase.h>
 #include <WebKit/WKPage.h>
 
+#if defined(WIN32) || defined(_WIN32)
+typedef int WKProcessID;
+#else
 #include <unistd.h>
+typedef pid_t WKProcessID;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -171,7 +176,7 @@ WK_EXPORT void WKPageRestoreFromSessionStateWithoutNavigation(WKPageRef page, WK
 
 WK_EXPORT void WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportScaleLimits);
 
-WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
+WK_EXPORT WKProcessID WKPageGetProcessIdentifier(WKPageRef page);
 
 #ifdef __cplusplus
 }
index c63b9be..7b31c8e 100644 (file)
@@ -29,6 +29,7 @@
 #include "MessageReceiverMap.h"
 #include "ProcessLauncher.h"
 
+#include <wtf/ProcessID.h>
 #include <wtf/SystemTracing.h>
 #include <wtf/ThreadSafeRefCounted.h>
 
@@ -72,7 +73,7 @@ public:
     };
     State state() const;
 
-    pid_t processIdentifier() const { return m_processLauncher ? m_processLauncher->processIdentifier() : 0; }
+    ProcessID processIdentifier() const { return m_processLauncher ? m_processLauncher->processIdentifier() : 0; }
 
     bool canSendMessage() const { return state() != State::Terminated;}
     bool sendMessage(std::unique_ptr<IPC::Encoder>, OptionSet<IPC::SendOption>);
index 089c17c..f2f72ac 100644 (file)
@@ -41,7 +41,7 @@ ProcessLauncher::ProcessLauncher(Client* client, const LaunchOptions& launchOpti
     launchProcess();
 }
 
-void ProcessLauncher::didFinishLaunchingProcess(pid_t processIdentifier, IPC::Connection::Identifier identifier)
+void ProcessLauncher::didFinishLaunchingProcess(ProcessID processIdentifier, IPC::Connection::Identifier identifier)
 {
     m_processIdentifier = processIdentifier;
     m_isLaunching = false;
index 6798fc9..022ab6a 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "Connection.h"
 #include <wtf/HashMap.h>
+#include <wtf/ProcessID.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
 #include <wtf/WeakPtr.h>
@@ -69,7 +70,7 @@ public:
     }
 
     bool isLaunching() const { return m_isLaunching; }
-    pid_t processIdentifier() const { return m_processIdentifier; }
+    ProcessID processIdentifier() const { return m_processIdentifier; }
 
     void terminateProcess();
     void invalidate();
@@ -78,7 +79,7 @@ private:
     ProcessLauncher(Client*, const LaunchOptions& launchOptions);
 
     void launchProcess();
-    void didFinishLaunchingProcess(pid_t, IPC::Connection::Identifier);
+    void didFinishLaunchingProcess(ProcessID, IPC::Connection::Identifier);
 
     void platformInvalidate();
 
@@ -91,7 +92,7 @@ private:
     WeakPtrFactory<ProcessLauncher> m_weakPtrFactory;
     const LaunchOptions m_launchOptions;
     bool m_isLaunching;
-    pid_t m_processIdentifier;
+    ProcessID m_processIdentifier;
 };
 
 } // namespace WebKit
index a66e122..92e3d8c 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace WebKit {
 
-ProcessAssertion::ProcessAssertion(pid_t, AssertionState assertionState, Function<void()>&&)
+ProcessAssertion::ProcessAssertion(ProcessID, AssertionState assertionState, Function<void()>&&)
     : m_assertionState(assertionState)
 {
 }
@@ -47,7 +47,7 @@ void ProcessAssertion::setState(AssertionState assertionState)
     m_assertionState = assertionState;
 }
 
-ProcessAndUIAssertion::ProcessAndUIAssertion(pid_t pid, AssertionState assertionState)
+ProcessAndUIAssertion::ProcessAndUIAssertion(ProcessID pid, AssertionState assertionState)
     : ProcessAssertion(pid, assertionState)
 {
 }
index e5e3a3b..2032000 100644 (file)
@@ -28,6 +28,7 @@
 
 #include <unistd.h>
 #include <wtf/Function.h>
+#include <wtf/ProcessID.h>
 
 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
 #include <wtf/RetainPtr.h>
@@ -51,7 +52,7 @@ public:
 
 class ProcessAssertion {
 public:
-    ProcessAssertion(pid_t, AssertionState, Function<void()>&& invalidationCallback = { });
+    ProcessAssertion(ProcessID, AssertionState, Function<void()>&& invalidationCallback = { });
     virtual ~ProcessAssertion();
 
     virtual void setClient(ProcessAssertionClient& client) { m_client = &client; }
@@ -82,7 +83,7 @@ private:
     
 class ProcessAndUIAssertion final : public ProcessAssertion {
 public:
-    ProcessAndUIAssertion(pid_t, AssertionState);
+    ProcessAndUIAssertion(ProcessID, AssertionState);
     ~ProcessAndUIAssertion();
 
     void setClient(ProcessAssertionClient&) final;
index eed3e60..86a8fae 100644 (file)
@@ -91,7 +91,7 @@ void ProcessThrottler::updateAssertion()
     updateAssertionNow();
 }
 
-void ProcessThrottler::didConnectToProcess(pid_t pid)
+void ProcessThrottler::didConnectToProcess(ProcessID pid)
 {
     RELEASE_LOG(ProcessSuspension, "%p - ProcessThrottler::didConnectToProcess(%d)", this, pid);
 
index cb1a4f2..7d90db6 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "ProcessAssertion.h"
 
+#include <wtf/ProcessID.h>
 #include <wtf/RefCounter.h>
 #include <wtf/RunLoop.h>
 #include <wtf/WeakPtr.h>
@@ -56,7 +57,7 @@ public:
     inline ForegroundActivityToken foregroundActivityToken() const;
     inline BackgroundActivityToken backgroundActivityToken() const;
     
-    void didConnectToProcess(pid_t);
+    void didConnectToProcess(ProcessID);
     void processReadyToSuspend();
     void didCancelProcessSuspension();
 
index 5470eea..1265781 100644 (file)
@@ -441,7 +441,7 @@ const API::PageConfiguration& WebPageProxy::configuration() const
     return m_configuration.get();
 }
 
-pid_t WebPageProxy::processIdentifier() const
+ProcessID WebPageProxy::processIdentifier() const
 {
     if (m_isClosed)
         return 0;
index 1f4243e..b564cdc 100644 (file)
@@ -84,6 +84,7 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/MonotonicTime.h>
+#include <wtf/ProcessID.h>
 #include <wtf/Ref.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
@@ -875,7 +876,7 @@ public:
 #endif
 
     WebProcessProxy& process() { return m_process; }
-    pid_t processIdentifier() const;
+    ProcessID processIdentifier() const;
 
     WebPreferences& preferences() { return m_preferences; }
     void setPreferences(WebPreferences&);
index dfedb61..acb9d56 100644 (file)
@@ -1085,7 +1085,7 @@ void WebProcessPool::refreshPlugins()
 
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
-pid_t WebProcessPool::networkProcessIdentifier()
+ProcessID WebProcessPool::networkProcessIdentifier()
 {
     if (!m_networkProcess)
         return 0;
@@ -1093,7 +1093,7 @@ pid_t WebProcessPool::networkProcessIdentifier()
     return m_networkProcess->processIdentifier();
 }
 
-pid_t WebProcessPool::storageProcessIdentifier()
+ProcessID WebProcessPool::storageProcessIdentifier()
 {
     if (!m_storageProcess)
         return 0;
index 24ebaa1..e19f6df 100644 (file)
@@ -49,6 +49,7 @@
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
+#include <wtf/ProcessID.h>
 #include <wtf/RefCounter.h>
 #include <wtf/RefPtr.h>
 #include <wtf/text/StringHash.h>
@@ -199,8 +200,8 @@ public:
     const HashMap<String, HashMap<String, HashMap<String, uint8_t>>>& pluginLoadClientPolicies() const { return m_pluginLoadClientPolicies; }
 #endif
 
-    pid_t networkProcessIdentifier();
-    pid_t storageProcessIdentifier();
+    ProcessID networkProcessIdentifier();
+    ProcessID storageProcessIdentifier();
 
     void setAlwaysUsesComplexTextCodePath(bool);
     void setShouldUseFontSmoothing(bool);