Diff
Modified: trunk/Source/WebKit2/ChangeLog (196660 => 196661)
--- 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)
@@ -1,5 +1,32 @@
2016-02-16 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Remove WebKit2 header cruft
https://bugs.webkit.org/show_bug.cgi?id=154309
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (196660 => 196661)
--- 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)
@@ -48,10 +48,6 @@
#include <wtf/spi/darwin/XPCSPI.h>
#endif
-#if PLATFORM(GTK) || PLATFORM(EFL)
-#include "PlatformProcessIdentifier.h"
-#endif
-
#if PLATFORM(GTK)
#include "GSocketMonitor.h"
#endif
Deleted: trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h (196660 => 196661)
--- 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)
@@ -1,46 +0,0 @@
-/*
- * 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
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp (196660 => 196661)
--- 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)
@@ -184,8 +184,8 @@
Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
ASSERT_EQ(webView1WebProcessID, webView2WebProcessID);
}
@@ -203,8 +203,8 @@
Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
ASSERT_NE(webView1WebProcessID, webView2WebProcessID);
}
@@ -222,13 +222,13 @@
Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
- PlatformProcessIdentifier webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
- PlatformProcessIdentifier webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
+ pid_t webView1WebProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processIdentifier();
+ pid_t webView2WebProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processIdentifier();
ASSERT_EQ(webView1WebProcessID, webView2WebProcessID);
- PlatformProcessIdentifier webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
- PlatformProcessIdentifier webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
+ pid_t webView1NetworkProcessID = toImpl(EWKViewGetWKView(webView1))->page()->process().processPool().networkProcess()->processIdentifier();
+ pid_t webView2NetworkProcessID = toImpl(EWKViewGetWKView(webView2))->page()->process().processPool().networkProcess()->processIdentifier();
ASSERT_EQ(webView1NetworkProcessID, webView2NetworkProcessID);
}
@@ -246,10 +246,10 @@
Evas_Object* webView1 = ewk_view_smart_add(evas, smart, context, pageGroup);
Evas_Object* webView2 = ewk_view_smart_add(evas, smart, context, pageGroup);
- 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();
+ 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();
if (!webView1WebProcessID || !webView2WebProcessID)
return;
Modified: trunk/Source/WebKit2/UIProcess/ChildProcessProxy.h (196660 => 196661)
--- 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)
@@ -68,7 +68,7 @@
};
State state() const;
- PlatformProcessIdentifier processIdentifier() const { return m_processLauncher->processIdentifier(); }
+ pid_t processIdentifier() const { return m_processLauncher->processIdentifier(); }
bool canSendMessage() const { return state() != State::Terminated;}
bool sendMessage(std::unique_ptr<IPC::MessageEncoder>, unsigned messageSendFlags);
Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (196660 => 196661)
--- 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)
@@ -51,7 +51,7 @@
});
}
-void ProcessLauncher::didFinishLaunchingProcess(PlatformProcessIdentifier processIdentifier, IPC::Connection::Identifier identifier)
+void ProcessLauncher::didFinishLaunchingProcess(pid_t processIdentifier, IPC::Connection::Identifier identifier)
{
m_processIdentifier = processIdentifier;
m_isLaunching = false;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (196660 => 196661)
--- 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)
@@ -27,7 +27,6 @@
#define WebProcessLauncher_h
#include "Connection.h"
-#include "PlatformProcessIdentifier.h"
#include <wtf/HashMap.h>
#include <wtf/RefPtr.h>
#include <wtf/Threading.h>
@@ -72,7 +71,7 @@
}
bool isLaunching() const { return m_isLaunching; }
- PlatformProcessIdentifier processIdentifier() const { return m_processIdentifier; }
+ pid_t processIdentifier() const { return m_processIdentifier; }
void terminateProcess();
void invalidate();
@@ -81,7 +80,7 @@
ProcessLauncher(Client*, const LaunchOptions& launchOptions);
void launchProcess();
- void didFinishLaunchingProcess(PlatformProcessIdentifier, IPC::Connection::Identifier);
+ void didFinishLaunchingProcess(pid_t, IPC::Connection::Identifier);
void platformInvalidate();
@@ -89,7 +88,7 @@
const LaunchOptions m_launchOptions;
bool m_isLaunching;
- PlatformProcessIdentifier m_processIdentifier;
+ pid_t m_processIdentifier;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (196660 => 196661)
--- 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)
@@ -46,7 +46,7 @@
namespace WebKit {
-typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(PlatformProcessIdentifier, IPC::Connection::Identifier);
+typedef void (ProcessLauncher::*DidFinishLaunchingProcessFunction)(pid_t, IPC::Connection::Identifier);
static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptions)
{
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (196660 => 196661)
--- 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)
@@ -523,7 +523,7 @@
return m_configuration.get();
}
-PlatformProcessIdentifier WebPageProxy::processIdentifier() const
+pid_t WebPageProxy::processIdentifier() const
{
if (m_isClosed)
return 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (196660 => 196661)
--- 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)
@@ -42,7 +42,6 @@
#include "MessageSender.h"
#include "NotificationPermissionRequestManagerProxy.h"
#include "PageLoadState.h"
-#include "PlatformProcessIdentifier.h"
#include "ProcessThrottler.h"
#include "SandboxExtension.h"
#include "ShareableBitmap.h"
@@ -836,7 +835,7 @@
#endif
WebProcessProxy& process() { return m_process; }
- PlatformProcessIdentifier processIdentifier() const;
+ pid_t processIdentifier() const;
WebPreferences& preferences() { return m_preferences; }
void setPreferences(WebPreferences&);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (196660 => 196661)
--- 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)
@@ -837,7 +837,7 @@
}
#endif // ENABLE(NETSCAPE_PLUGIN_API)
-PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
+pid_t WebProcessPool::networkProcessIdentifier()
{
if (!m_networkProcess)
return 0;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (196660 => 196661)
--- 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)
@@ -186,7 +186,7 @@
void clearPluginClientPolicies();
#endif
- PlatformProcessIdentifier networkProcessIdentifier();
+ pid_t networkProcessIdentifier();
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (196660 => 196661)
--- 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)
@@ -30,7 +30,6 @@
#include "ChildProcessProxy.h"
#include "CustomProtocolManagerProxy.h"
#include "MessageReceiverMap.h"
-#include "PlatformProcessIdentifier.h"
#include "PluginInfoStore.h"
#include "ProcessLauncher.h"
#include "ProcessThrottlerClient.h"
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (196660 => 196661)
--- 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)
@@ -1513,7 +1513,6 @@
BC8699B5116AADAA002A925B /* WKView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B2116AADAA002A925B /* WKView.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC8699B6116AADAA002A925B /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8699B3116AADAA002A925B /* WKView.mm */; };
BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B4116AADAA002A925B /* WKViewInternal.h */; };
- BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */; };
BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8A501411765F5600757573 /* WKRetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */; };
BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8ACA1016670D7B004C1941 /* ObjCObjectGraph.mm */; };
@@ -3568,7 +3567,6 @@
BC8699B2116AADAA002A925B /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKView.h; sourceTree = "<group>"; };
BC8699B3116AADAA002A925B /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKView.mm; sourceTree = "<group>"; };
BC8699B4116AADAA002A925B /* WKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewInternal.h; sourceTree = "<group>"; };
- BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformProcessIdentifier.h; sourceTree = "<group>"; };
BC87DFA91018101400564216 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
BC8A501411765F5600757573 /* WKRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRetainPtr.h; sourceTree = "<group>"; };
BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCObjectGraph.h; sourceTree = "<group>"; };
@@ -6408,7 +6406,6 @@
51A7F2F2125BF820008AEB1D /* Logging.h */,
C0E3AA451209E2BA00A49D01 /* Module.cpp */,
C0E3AA441209E2BA00A49D01 /* Module.h */,
- BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */,
1A24BED3120894D100FBB059 /* SharedMemory.h */,
);
path = Platform;
@@ -7472,7 +7469,6 @@
2D8710171828415D0018FA01 /* PlatformCALayerRemoteCustom.h in Headers */,
2D8949F1182044F600E898AA /* PlatformCALayerRemoteTiledBacking.h in Headers */,
BCC43ABB127B95DC00317F16 /* PlatformPopupMenuData.h in Headers */,
- BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */,
1A6FB7D311E651E200DB1371 /* Plugin.h in Headers */,
31A67E0D165B2A99006CBA66 /* PlugInAutoStartProvider.h in Headers */,
1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */,
