Title: [137755] trunk/Source/WebKit2
- Revision
- 137755
- Author
- [email protected]
- Date
- 2012-12-14 10:42:37 -0800 (Fri, 14 Dec 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137754 => 137755)
--- trunk/Source/WebKit2/ChangeLog 2012-12-14 18:35:32 UTC (rev 137754)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-14 18:42:37 UTC (rev 137755)
@@ -1,3 +1,16 @@
+2012-12-14 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
[CSS Shaders] Remove code for the other mesh box types (border-box | padding-box | content-box)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (137754 => 137755)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-14 18:35:32 UTC (rev 137754)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2012-12-14 18:42:37 UTC (rev 137755)
@@ -691,7 +691,12 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
