Diff
Modified: trunk/Source/_javascript_Core/API/JSRemoteInspector.cpp (222308 => 222309)
--- trunk/Source/_javascript_Core/API/JSRemoteInspector.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/_javascript_Core/API/JSRemoteInspector.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
#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));
Modified: trunk/Source/_javascript_Core/API/JSRemoteInspector.h (222308 => 222309)
--- trunk/Source/_javascript_Core/API/JSRemoteInspector.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/_javascript_Core/API/JSRemoteInspector.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -29,7 +29,12 @@
#include <_javascript_Core/JSBase.h>
#include <_javascript_Core/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 @@
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);
Modified: trunk/Source/_javascript_Core/ChangeLog (222308 => 222309)
--- trunk/Source/_javascript_Core/ChangeLog 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-09-21 02:55:06 UTC (rev 222309)
@@ -1,3 +1,15 @@
+2017-09-20 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
Rename source list file to Sources.txt
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h (222308 => 222309)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
#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 @@
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
Modified: trunk/Source/WTF/ChangeLog (222308 => 222309)
--- trunk/Source/WTF/ChangeLog 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WTF/ChangeLog 2017-09-21 02:55:06 UTC (rev 222309)
@@ -1,3 +1,13 @@
+2017-09-20 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
JSC Xcode build should use unified sources for platform independent files
Modified: trunk/Source/WTF/wtf/ProcessID.h (222308 => 222309)
--- trunk/Source/WTF/wtf/ProcessID.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WTF/wtf/ProcessID.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -36,7 +36,13 @@
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 @@
} // namespace WTF
using WTF::getCurrentProcessID;
+using WTF::ProcessID;
#endif // ProcessID_h
Modified: trunk/Source/WebKit/ChangeLog (222308 => 222309)
--- trunk/Source/WebKit/ChangeLog 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/ChangeLog 2017-09-21 02:55:06 UTC (rev 222309)
@@ -1,3 +1,42 @@
+2017-09-20 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
[WK2] Add API to get the redirect chain of a WKDownload
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (222308 => 222309)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
Seconds loadThrottleLatency;
Vector<String> urlSchemesRegisteredForCustomProtocols;
- pid_t presentingApplicationPID { 0 };
+ ProcessID presentingApplicationPID { 0 };
#if PLATFORM(COCOA)
String parentProcessName;
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (222308 => 222309)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
String uiProcessBundleIdentifier;
#endif
- pid_t presentingApplicationPID { 0 };
+ ProcessID presentingApplicationPID { 0 };
#if PLATFORM(COCOA)
WebCore::MachSendRight acceleratedCompositingPort;
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -138,8 +138,8 @@
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 @@
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
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -599,12 +599,12 @@
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();
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -29,7 +29,12 @@
#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 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
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -2741,7 +2741,7 @@
#endif
}
-pid_t WKPageGetProcessIdentifier(WKPageRef page)
+ProcessID WKPageGetProcessIdentifier(WKPageRef page)
{
return toImpl(page)->processIdentifier();
}
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -29,7 +29,12 @@
#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 WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportScaleLimits);
-WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
+WK_EXPORT WKProcessID WKPageGetProcessIdentifier(WKPageRef page);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/UIProcess/ChildProcessProxy.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/ChildProcessProxy.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/ChildProcessProxy.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
};
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>);
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -41,7 +41,7 @@
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;
Modified: trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
}
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 @@
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 @@
WeakPtrFactory<ProcessLauncher> m_weakPtrFactory;
const LaunchOptions m_launchOptions;
bool m_isLaunching;
- pid_t m_processIdentifier;
+ ProcessID m_processIdentifier;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/ProcessAssertion.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/ProcessAssertion.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/ProcessAssertion.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
m_assertionState = assertionState;
}
-ProcessAndUIAssertion::ProcessAndUIAssertion(pid_t pid, AssertionState assertionState)
+ProcessAndUIAssertion::ProcessAndUIAssertion(ProcessID pid, AssertionState assertionState)
: ProcessAssertion(pid, assertionState)
{
}
Modified: trunk/Source/WebKit/UIProcess/ProcessAssertion.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/ProcessAssertion.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
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 @@
class ProcessAndUIAssertion final : public ProcessAssertion {
public:
- ProcessAndUIAssertion(pid_t, AssertionState);
+ ProcessAndUIAssertion(ProcessID, AssertionState);
~ProcessAndUIAssertion();
void setClient(ProcessAssertionClient&) final;
Modified: trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -91,7 +91,7 @@
updateAssertionNow();
}
-void ProcessThrottler::didConnectToProcess(pid_t pid)
+void ProcessThrottler::didConnectToProcess(ProcessID pid)
{
RELEASE_LOG(ProcessSuspension, "%p - ProcessThrottler::didConnectToProcess(%d)", this, pid);
Modified: trunk/Source/WebKit/UIProcess/ProcessThrottler.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/ProcessThrottler.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/ProcessThrottler.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
inline ForegroundActivityToken foregroundActivityToken() const;
inline BackgroundActivityToken backgroundActivityToken() const;
- void didConnectToProcess(pid_t);
+ void didConnectToProcess(ProcessID);
void processReadyToSuspend();
void didCancelProcessSuspension();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -441,7 +441,7 @@
return m_configuration.get();
}
-pid_t WebPageProxy::processIdentifier() const
+ProcessID WebPageProxy::processIdentifier() const
{
if (m_isClosed)
return 0;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
#endif
WebProcessProxy& process() { return m_process; }
- pid_t processIdentifier() const;
+ ProcessID processIdentifier() const;
WebPreferences& preferences() { return m_preferences; }
void setPreferences(WebPreferences&);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2017-09-21 02:55:06 UTC (rev 222309)
@@ -1085,7 +1085,7 @@
#endif // ENABLE(NETSCAPE_PLUGIN_API)
-pid_t WebProcessPool::networkProcessIdentifier()
+ProcessID WebProcessPool::networkProcessIdentifier()
{
if (!m_networkProcess)
return 0;
@@ -1093,7 +1093,7 @@
return m_networkProcess->processIdentifier();
}
-pid_t WebProcessPool::storageProcessIdentifier()
+ProcessID WebProcessPool::storageProcessIdentifier()
{
if (!m_storageProcess)
return 0;
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (222308 => 222309)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-09-21 02:48:38 UTC (rev 222308)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2017-09-21 02:55:06 UTC (rev 222309)
@@ -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 @@
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);
