Title: [160371] trunk/Source/WebKit2
- Revision
- 160371
- Author
- commit-qu...@webkit.org
- Date
- 2013-12-10 09:47:55 -0800 (Tue, 10 Dec 2013)
Log Message
Allow us to use network process with a single process model
https://bugs.webkit.org/show_bug.cgi?id=125507
Patch by Kwang Yul Seo <sk...@company100.net> on 2013-12-10
Reviewed by Brady Eidson.
Currently, WebContext::sendToNetworkingProcess and
WebContext::sendToNetworkingProcessRelaunchingIfNecessary assume that
network process is not used when the given process model is
ProcessModelSharedSecondaryProcess. This is not consistent with
WebContext::networkingProcessConnection which returns the networking
process connection for ProcessModelSharedSecondaryProcess.
* UIProcess/WebContext.h:
(WebKit::WebContext::sendToNetworkingProcess):
(WebKit::WebContext::sendToNetworkingProcessRelaunchingIfNecessary):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160370 => 160371)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 16:50:49 UTC (rev 160370)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 17:47:55 UTC (rev 160371)
@@ -1,3 +1,21 @@
+2013-12-10 Kwang Yul Seo <sk...@company100.net>
+
+ Allow us to use network process with a single process model
+ https://bugs.webkit.org/show_bug.cgi?id=125507
+
+ Reviewed by Brady Eidson.
+
+ Currently, WebContext::sendToNetworkingProcess and
+ WebContext::sendToNetworkingProcessRelaunchingIfNecessary assume that
+ network process is not used when the given process model is
+ ProcessModelSharedSecondaryProcess. This is not consistent with
+ WebContext::networkingProcessConnection which returns the networking
+ process connection for ProcessModelSharedSecondaryProcess.
+
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::sendToNetworkingProcess):
+ (WebKit::WebContext::sendToNetworkingProcessRelaunchingIfNecessary):
+
2013-12-10 Michał Pakuła vel Rutka <m.pak...@samsung.com>
Unreviewed EFL build fix
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (160370 => 160371)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-10 16:50:49 UTC (rev 160370)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-10 17:47:55 UTC (rev 160371)
@@ -516,6 +516,13 @@
{
switch (m_processModel) {
case ProcessModelSharedSecondaryProcess:
+#if ENABLE(NETWORK_PROCESS)
+ if (m_usesNetworkProcess) {
+ if (m_networkProcess->canSendMessage())
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+ }
+#endif
if (!m_processes.isEmpty() && m_processes[0]->canSendMessage())
m_processes[0]->send(std::forward<T>(message), 0);
return;
@@ -536,6 +543,13 @@
{
switch (m_processModel) {
case ProcessModelSharedSecondaryProcess:
+#if ENABLE(NETWORK_PROCESS)
+ if (m_usesNetworkProcess) {
+ ensureNetworkProcess();
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+ }
+#endif
ensureSharedWebProcess();
m_processes[0]->send(std::forward<T>(message), 0);
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
