Changeset 161559 in webkit

Timestamp:

Jan 9, 2014 9:55:39 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Crash when starting a download before the network process has been launched
​https://bugs.webkit.org/show_bug.cgi?id=126258

Reviewed by Anders Carlsson.

We need to ensure there's a network process running before
starting a new download like we do when using the web process.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::download): Use ChildProcessProxy::send()
instead of using the connection to make sure messages are queued
if the process is still launching.
(WebKit::WebContext::createDownloadProxy): Call
ensureNetworkProcess() before creating the download proxy.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Crash when starting a download before the network process has been launched
+        https://bugs.webkit.org/show_bug.cgi?id=126258
+
+        Reviewed by Anders Carlsson.
+
+        We need to ensure there's a network process running before
+        starting a new download like we do when using the web process.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::download): Use ChildProcessProxy::send()
+        instead of using the connection to make sure messages are queued
+        if the process is still launching.
+        (WebKit::WebContext::createDownloadProxy): Call
+        ensureNetworkProcess() before creating the download proxy.
+
 2014-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -764 +764 @@
     if (usesNetworkProcess() && networkProcess()) {
         // FIXME (NetworkProcess): Replicate whatever FrameLoader::setOriginalURLForDownloadRequest does with the request here.
-        networkProcess()->connection()->send(Messages::NetworkProcess::DownloadRequest(downloadProxy->downloadID(), request), 0);
+        networkProcess()->send(Messages::NetworkProcess::DownloadRequest(downloadProxy->downloadID(), request), 0);
         return downloadProxy;
     }
@@ -939 +939 @@
 {
 #if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess())
+    if (usesNetworkProcess()) {
+        ensureNetworkProcess();
+        ASSERT(m_networkProcess);
         return m_networkProcess->createDownloadProxy();
+    }
 #endif