Attachment #211799 for bug #121434

View Details Raw Unified Return to Bug 121434

| Differences between



2013-09-16  Csaba Osztrogonác  <ossy@webkit.org>

        [GTK][EFL] Add NetworkProcess support for ProcessLauncher
        https://bugs.webkit.org/show_bug.cgi?id=121434

        Reviewed by NOBODY (OOPS!).

        Original patch by Balazs Kelemen <kbalazs@webkit.org>
        and Kwang Yul Seo <skyul@company100.net>

        * Shared/ProcessExecutablePath.h:
        * Shared/efl/ProcessExecutablePathEfl.cpp:
        (WebKit::executablePathOfNetworkProcess):
        * Shared/gtk/ProcessExecutablePathGtk.cpp:
        (WebKit::executablePathOfNetworkProcess):
        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
        (WebKit::ProcessLauncher::launchProcess):
        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
        (WebKit::ProcessLauncher::launchProcess):

2013-09-16  Andre Moreira Magalhaes   <andre.magalhaes@collabora.co.uk>

        Web Inspector: Do not try to parse incomplete HTTP requests

Lines 32-37 namespace WebKit { a/Source/WebKit2/Shared/ProcessExecutablePath.h_sec1
- a/Source/WebKit2/Shared/ProcessExecutablePath.h +3 lines
32		32
33	String executablePathOfWebProcess();	33	String executablePathOfWebProcess();
34	String executablePathOfPluginProcess();	34	String executablePathOfPluginProcess();
		35	#if ENABLE(NETWORK_PROCESS)
		36	String executablePathOfNetworkProcess();
		37	#endif
35		38
36	}	39	}
37		40

Lines 74-77 String executablePathOfPluginProcess() a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp_sec1
- a/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp +9 lines
74	return webKitPluginProcessName;	74	return webKitPluginProcessName;
75	}	75	}
76		76
		77	#if ENABLE(NETWORK_PROCESS)
		78	String executablePathOfNetworkProcess()
		79	{
		80	DEFINE_STATIC_LOCAL(const String, webKitNetworkProcessName, (findProcessPath(NETWORKPROCESSNAME)));
		81
		82	return webKitNetworkProcessName;
		83	}
		84	#endif
		85
77	} // namespace WebKit	86	} // namespace WebKit

Lines 37-42 namespace WebKit { a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp_sec1
- a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp +8 lines
37		37
38	const char* gWebKitWebProcessName = "WebKitWebProcess";	38	const char* gWebKitWebProcessName = "WebKitWebProcess";
39	const char* gWebKitPluginProcessName = "WebKitPluginProcess";	39	const char* gWebKitPluginProcessName = "WebKitPluginProcess";
		40	const char* gWebKitNetworkProcessName = "WebKitNetworkProcess";
40		41
41	static String findWebKitProcess(const char* processName)	42	static String findWebKitProcess(const char* processName)
42	{	43	{
Lines 76-79 String executablePathOfPluginProcess() a/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp_sec2
76	return findWebKitProcess(gWebKitPluginProcessName);	77	return findWebKitProcess(gWebKitPluginProcessName);
77	}	78	}
78		79
		80	#if ENABLE(NETWORK_PROCESS)
		81	String executablePathOfNetworkProcess()
		82	{
		83	return findWebKitProcess(gWebKitNetworkProcessName);
		84	}
		85	#endif
		86
79	} // namespace WebKit	87	} // namespace WebKit

Lines 83-88 void ProcessLauncher::launchProcess() a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp_sec1
- a/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp +5 lines
83	pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");	83	pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
84	break;	84	break;
85	#endif	85	#endif
		86	#if ENABLE(NETWORK_PROCESS)
		87	case NetworkProcess:
		88	executablePath = executablePathOfNetworkProcess();
		89	break;
		90	#endif
86	default:	91	default:
87	ASSERT_NOT_REACHED();	92	ASSERT_NOT_REACHED();
88	return;	93	return;




    String executablePath, pluginPath;
    CString realExecutablePath, realPluginPath;
    switch (m_launchOptions.processType) {
    case WebProcess:
        executablePath = executablePathOfWebProcess();
        break;
    case PluginProcess:
        executablePath = executablePathOfPluginProcess();
        pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
        realPluginPath = fileSystemRepresentation(pluginPath);
        break;
#if ENABLE(NETWORK_PROCESS)
    case NetworkProcess:
        executablePath = executablePathOfNetworkProcess();
        break;
#endif
    default:
        ASSERT_NOT_REACHED();
        return;
    }

    realExecutablePath = fileSystemRepresentation(executablePath);

Return to Bug 121434

Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +20 lines
		1	2013-09-16 Csaba Osztrogonác <ossy@webkit.org>
		2
		3	[GTK][EFL] Add NetworkProcess support for ProcessLauncher
		4	https://bugs.webkit.org/show_bug.cgi?id=121434
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Original patch by Balazs Kelemen <kbalazs@webkit.org>
		9	and Kwang Yul Seo <skyul@company100.net>
		10
		11	* Shared/ProcessExecutablePath.h:
		12	* Shared/efl/ProcessExecutablePathEfl.cpp:
		13	(WebKit::executablePathOfNetworkProcess):
		14	* Shared/gtk/ProcessExecutablePathGtk.cpp:
		15	(WebKit::executablePathOfNetworkProcess):
		16	* UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
		17	(WebKit::ProcessLauncher::launchProcess):
		18	* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
		19	(WebKit::ProcessLauncher::launchProcess):
		20
1	2013-09-16 Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk>	21	2013-09-16 Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk>
2		22
3	Web Inspector: Do not try to parse incomplete HTTP requests	23	Web Inspector: Do not try to parse incomplete HTTP requests

Lines 76-87 void ProcessLauncher::launchProcess() a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp_sec1
- a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp -2 / +13 lines
76		76
77	String executablePath, pluginPath;	77	String executablePath, pluginPath;
78	CString realExecutablePath, realPluginPath;	78	CString realExecutablePath, realPluginPath;
79	if (m_launchOptions.processType == WebProcess)	79	switch (m_launchOptions.processType) {
		80	case WebProcess:
80	executablePath = executablePathOfWebProcess();	81	executablePath = executablePathOfWebProcess();
81	else {	82	break;
		83	case PluginProcess:
82	executablePath = executablePathOfPluginProcess();	84	executablePath = executablePathOfPluginProcess();
83	pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");	85	pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
84	realPluginPath = fileSystemRepresentation(pluginPath);	86	realPluginPath = fileSystemRepresentation(pluginPath);
		87	break;
		88	#if ENABLE(NETWORK_PROCESS)
		89	case NetworkProcess:
		90	executablePath = executablePathOfNetworkProcess();
		91	break;
		92	#endif
		93	default:
		94	ASSERT_NOT_REACHED();
		95	return;
85	}	96	}
86		97
87	realExecutablePath = fileSystemRepresentation(executablePath);	98	realExecutablePath = fileSystemRepresentation(executablePath);