Fix assertion failure when the network process is enabled
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Dec 2012 18:42:37 +0000 (18:42 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Dec 2012 18:42:37 +0000 (18:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105040
<rdar://problem/12883632>

Reviewed by Alexey Proskuryakov.

Make sure that we don't call into the download manager when running with a network process.

* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::shouldTerminate):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@137755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebProcess.cpp

index ca1f7aa..d1d8bb1 100644 (file)
@@ -1,3 +1,16 @@
+2012-12-14  Anders Carlsson  <andersca@apple.com>
+
+        Fix assertion failure when the network process is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=105040
+        <rdar://problem/12883632>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Make sure that we don't call into the download manager when running with a network process.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::shouldTerminate):
+
 2012-12-14  Michelangelo De Simone  <michelangelo@webkit.org>
 
         [CSS Shaders] Remove code for the other mesh box types (border-box | padding-box | content-box)
index 408d3b4..16771a0 100644 (file)
@@ -691,7 +691,12 @@ bool WebProcess::shouldTerminate()
         return false;
 
     ASSERT(m_pageMap.isEmpty());
+
+#if ENABLE(NETWORK_PROCESS)
+    ASSERT(m_usesNetworkProcess || !downloadManager().isDownloading());
+#else
     ASSERT(!downloadManager().isDownloading());
+#endif
 
     // FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
     bool shouldTerminate = false;