Changeset 160371 in webkit

Timestamp:

Dec 10, 2013 9:47:55 AM (10 years ago)

Author:

commit-queue@webkit.org

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 <​skyul@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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebContext.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-10  Kwang Yul Seo  <skyul@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.pakula@samsung.com>
 

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -517 +517 @@
     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);
@@ -537 +544 @@
     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);