Diff
Modified: trunk/Source/WebKit2/ChangeLog (140914 => 140915)
--- trunk/Source/WebKit2/ChangeLog 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-26 20:15:26 UTC (rev 140915)
@@ -1,5 +1,23 @@
2013-01-26 Sam Weinig <[email protected]>
+ Hoist command line parsing into ChildProcessMain
+ https://bugs.webkit.org/show_bug.cgi?id=108010
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm:
+ (NetworkProcessMain):
+ * PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm:
+ (PluginProcessMain):
+ * Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.h:
+ (WebKit::ChildProcessMain):
+ * SharedWorkerProcess/EntryPoint/mac/LegacyProcess/SharedWorkerProcessMain.mm:
+ (SharedWorkerProcessMain):
+ * WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm:
+ (WebContentProcessMain):
+
+2013-01-26 Sam Weinig <[email protected]>
+
Move LegacyProcess entry points into new EntryPoint directories
https://bugs.webkit.org/show_bug.cgi?id=108008
Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm (140914 => 140915)
--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm 2013-01-26 20:15:26 UTC (rev 140915)
@@ -37,11 +37,7 @@
int NetworkProcessMain(int argc, char** argv)
{
- CommandLine commandLine;
- if (!commandLine.parse(argc, argv))
- return EXIT_FAILURE;
-
- return ChildProcessMain<NetworkProcess, ChildProcessMainDelegate>(commandLine);
+ return ChildProcessMain<NetworkProcess, ChildProcessMainDelegate>(argc, argv);
}
#endif // ENABLE(NETWORK_PROCESS)
Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm (140914 => 140915)
--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/PluginProcessMain.mm 2013-01-26 20:15:26 UTC (rev 140915)
@@ -103,11 +103,7 @@
int PluginProcessMain(int argc, char** argv)
{
- CommandLine commandLine;
- if (!commandLine.parse(argc, argv))
- return EXIT_FAILURE;
-
- return ChildProcessMain<PluginProcess, PluginProcessMainDelegate>(commandLine);
+ return ChildProcessMain<PluginProcess, PluginProcessMainDelegate>(argc, argv);
}
#endif // ENABLE(PLUGIN_PROCESS)
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.h (140914 => 140915)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.h 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/LegacyProcess/ChildProcessMain.h 2013-01-26 20:15:26 UTC (rev 140915)
@@ -58,8 +58,12 @@
};
template<typename ChildProcessType, typename ChildProcessMainDelegateType>
-int ChildProcessMain(const CommandLine& commandLine)
+int ChildProcessMain(int argc, char** argv)
{
+ CommandLine commandLine;
+ if (!commandLine.parse(argc, argv))
+ return EXIT_FAILURE;
+
ChildProcessMainDelegateType delegate(commandLine);
@autoreleasepool {
Modified: trunk/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/SharedWorkerProcessMain.mm (140914 => 140915)
--- trunk/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/SharedWorkerProcessMain.mm 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/SharedWorkerProcessMain.mm 2013-01-26 20:15:26 UTC (rev 140915)
@@ -37,11 +37,7 @@
int SharedWorkerProcessMain(int argc, char** argv)
{
- CommandLine commandLine;
- if (!commandLine.parse(argc, argv))
- return EXIT_FAILURE;
-
- return ChildProcessMain<SharedWorkerProcess, ChildProcessMainDelegate>(commandLine);
+ return ChildProcessMain<SharedWorkerProcess, ChildProcessMainDelegate>(argc, argv);
}
#endif // ENABLE(SHARED_WORKER_PROCESS)
Modified: trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm (140914 => 140915)
--- trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2013-01-26 19:44:01 UTC (rev 140914)
+++ trunk/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/WebContentProcessMain.mm 2013-01-26 20:15:26 UTC (rev 140915)
@@ -176,9 +176,5 @@
int WebContentProcessMain(int argc, char** argv)
{
- CommandLine commandLine;
- if (!commandLine.parse(argc, argv))
- return EXIT_FAILURE;
-
- return ChildProcessMain<WebProcess, WebContentProcessMainDelegate>(commandLine);
+ return ChildProcessMain<WebProcess, WebContentProcessMainDelegate>(argc, argv);
}
