Title: [161416] trunk/Source/WebKit2
- Revision
- 161416
- Author
- carlo...@webkit.org
- Date
- 2014-01-07 02:06:16 -0800 (Tue, 07 Jan 2014)
Log Message
Crash when trying to register a custom scheme before network process has been launched
https://bugs.webkit.org/show_bug.cgi?id=126385
Reviewed by Anders Carlsson.
WebContext::registerSchemeForCustomProtocol() uses
sendToNetworkingProcess() to send the message to the appropriate
networking process. In the case of using web process,
sendToNetworkingProcess() first checks if there's already a web
process, doing nothing otherwise, but when using the network
process it assumes there's already a network process. In both
cases it's safe to do nothing, because the schemes will be passed
as creation parameters to the process when launched.
* UIProcess/WebContext.h:
(WebKit::WebContext::sendToNetworkingProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (161415 => 161416)
--- trunk/Source/WebKit2/ChangeLog 2014-01-07 09:46:36 UTC (rev 161415)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-07 10:06:16 UTC (rev 161416)
@@ -1,3 +1,22 @@
+2014-01-07 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Crash when trying to register a custom scheme before network process has been launched
+ https://bugs.webkit.org/show_bug.cgi?id=126385
+
+ Reviewed by Anders Carlsson.
+
+ WebContext::registerSchemeForCustomProtocol() uses
+ sendToNetworkingProcess() to send the message to the appropriate
+ networking process. In the case of using web process,
+ sendToNetworkingProcess() first checks if there's already a web
+ process, doing nothing otherwise, but when using the network
+ process it assumes there's already a network process. In both
+ cases it's safe to do nothing, because the schemes will be passed
+ as creation parameters to the process when launched.
+
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::sendToNetworkingProcess):
+
2014-01-07 Jinwoo Song <jinwoo7.s...@samsung.com>
WebKit2 EFL build fix after r161387
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (161415 => 161416)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-07 09:46:36 UTC (rev 161415)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-01-07 10:06:16 UTC (rev 161416)
@@ -512,7 +512,7 @@
case ProcessModelSharedSecondaryProcess:
#if ENABLE(NETWORK_PROCESS)
if (m_usesNetworkProcess) {
- if (m_networkProcess->canSendMessage())
+ if (m_networkProcess && m_networkProcess->canSendMessage())
m_networkProcess->send(std::forward<T>(message), 0);
return;
}
@@ -522,7 +522,7 @@
return;
case ProcessModelMultipleSecondaryProcesses:
#if ENABLE(NETWORK_PROCESS)
- if (m_networkProcess->canSendMessage())
+ if (m_networkProcess && m_networkProcess->canSendMessage())
m_networkProcess->send(std::forward<T>(message), 0);
return;
#else
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
