<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204395] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204395">204395</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-11 17:34:22 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use a NetworkingContext when creating SocketStreamHandles
https://bugs.webkit.org/show_bug.cgi?id=160732
Patch by Alex Christensen <achristensen@webkit.org> on 2016-08-11
Reviewed by Brady Eidson.
Source/WebCore:
No change in behavior. After <a href="http://trac.webkit.org/projects/webkit/changeset/204327">r204327</a> a SessionID is all we need to get the NetworkStorageSession,
and we pass the SessionID to the SocketStreamHandle constructor, so use that instead.
SessionIDs can be serialized and sent over IPC. NetworkingContexts can't.
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::connect):
* page/SocketProvider.cpp:
(WebCore::SocketProvider::createSocketStreamHandle):
* page/SocketProvider.h:
* platform/network/cf/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::getStoredCONNECTProxyCredentials):
* platform/network/curl/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
* platform/network/soup/SocketStreamHandle.h:
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::SocketStreamHandle::create):
Source/WebKit2:
* WebProcess/Network/WebSocketProvider.cpp:
(WebKit::WebSocketProvider::createSocketStreamHandle):
* WebProcess/Network/WebSocketProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSocketProvidercpp">trunk/Source/WebCore/page/SocketProvider.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSocketProviderh">trunk/Source/WebCore/page/SocketProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh">trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleh">trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebSocketProvidercpp">trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebSocketProviderh">trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/ChangeLog 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-08-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Don't use a NetworkingContext when creating SocketStreamHandles
+ https://bugs.webkit.org/show_bug.cgi?id=160732
+
+ Reviewed by Brady Eidson.
+
+ No change in behavior. After r204327 a SessionID is all we need to get the NetworkStorageSession,
+ and we pass the SessionID to the SocketStreamHandle constructor, so use that instead.
+ SessionIDs can be serialized and sent over IPC. NetworkingContexts can't.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::connect):
+ * page/SocketProvider.cpp:
+ (WebCore::SocketProvider::createSocketStreamHandle):
+ * page/SocketProvider.h:
+ * platform/network/cf/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::getStoredCONNECTProxyCredentials):
+ * platform/network/curl/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ * platform/network/soup/SocketStreamHandle.h:
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::create):
+
+2016-08-11 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Use StringBuilder::appendLiteral when possible don't append result of makeString
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160772
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -124,12 +124,10 @@
</span><span class="cx"> InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url);
</span><span class="cx">
</span><span class="cx"> if (Frame* frame = m_document->frame()) {
</span><del>- if (NetworkingContext* networkingContext = frame->loader().networkingContext()) {
- ref();
- Page* page = frame->page();
- SessionID sessionID = page ? page->sessionID() : SessionID::defaultSessionID();
- m_handle = m_socketProvider->createSocketStreamHandle(m_handshake->url(), *this, *networkingContext, sessionID);
- }
</del><ins>+ ref();
+ Page* page = frame->page();
+ SessionID sessionID = page ? page->sessionID() : SessionID::defaultSessionID();
+ m_handle = m_socketProvider->createSocketStreamHandle(m_handshake->url(), *this, sessionID);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSocketProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SocketProvider.cpp (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SocketProvider.cpp 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/page/SocketProvider.cpp 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SocketStreamHandle> SocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, NetworkingContext& context, SessionID sessionID)
</del><ins>+Ref<SocketStreamHandle> SocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
</ins><span class="cx"> {
</span><del>- return SocketStreamHandle::create(url, client, context, sessionID);
</del><ins>+ return SocketStreamHandle::create(url, client, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SocketProvider.h (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SocketProvider.h 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/page/SocketProvider.h 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class NetworkingContext;
</del><span class="cx"> class ScriptExecutionContext;
</span><span class="cx"> class SocketStreamHandle;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="lines">@@ -41,7 +40,7 @@
</span><span class="cx"> public:
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> static Ref<SocketProvider> create() { return adoptRef(*new SocketProvider); }
</span><del>- virtual Ref<SocketStreamHandle> createSocketStreamHandle(const URL&, SocketStreamHandleClient&, NetworkingContext&, SessionID);
</del><ins>+ virtual Ref<SocketStreamHandle> createSocketStreamHandle(const URL&, SocketStreamHandleClient&, SessionID);
</ins><span class="cx"> #endif
</span><span class="cx"> virtual ~SocketProvider() { };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -40,15 +40,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class AuthenticationChallenge;
</del><span class="cx"> class Credential;
</span><del>-class NetworkingContext;
</del><span class="cx"> class ProtectionSpace;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext& networkingContext, SessionID sessionID) { return adoptRef(*new SocketStreamHandle(url, client, networkingContext, sessionID)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID sessionID) { return adoptRef(*new SocketStreamHandle(url, client, sessionID)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span><span class="lines">@@ -56,7 +54,7 @@
</span><span class="cx"> virtual int platformSend(const char* data, int length);
</span><span class="cx"> virtual void platformClose();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT SocketStreamHandle(const URL&, SocketStreamHandleClient&, NetworkingContext&, SessionID);
</del><ins>+ WEBCORE_EXPORT SocketStreamHandle(const URL&, SocketStreamHandleClient&, SessionID);
</ins><span class="cx"> void createStreams();
</span><span class="cx"> void scheduleStreams();
</span><span class="cx"> void chooseProxy();
</span><span class="lines">@@ -98,8 +96,7 @@
</span><span class="cx"> RetainPtr<CFWriteStreamRef> m_writeStream;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFURLRef> m_httpsURL; // ws(s): replaced with https:
</span><del>-
- Ref<NetworkingContext> m_networkingContext;
</del><ins>+ SessionID m_sessionID;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "CredentialStorage.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkStorageSession.h"
</span><del>-#include "NetworkingContext.h"
</del><span class="cx"> #include "ProtectionSpace.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "SocketStreamError.h"
</span><span class="lines">@@ -68,12 +67,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client, NetworkingContext& networkingContext, SessionID sessionID)
</del><ins>+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
</ins><span class="cx"> : SocketStreamHandleBase(url, client)
</span><span class="cx"> , m_connectingSubstate(New)
</span><span class="cx"> , m_connectionType(Unknown)
</span><span class="cx"> , m_sentStoredCredentials(false)
</span><del>- , m_networkingContext(networkingContext)
</del><ins>+ , m_sessionID(sessionID)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</span><span class="cx">
</span><span class="lines">@@ -356,9 +355,12 @@
</span><span class="cx"> // FIXME (<rdar://problem/10416495>): Proxy credentials should be retrieved from AuthBrokerAgent.
</span><span class="cx">
</span><span class="cx"> // Try system credential storage first, matching HTTP behavior (CFNetwork only asks the client for password if it couldn't find it in Keychain).
</span><del>- Credential storedCredential = m_networkingContext->storageSession().credentialStorage().getFromPersistentStorage(protectionSpace);
- if (storedCredential.isEmpty())
- storedCredential = m_networkingContext->storageSession().credentialStorage().get(protectionSpace);
</del><ins>+ Credential storedCredential;
+ if (auto* storageSession = NetworkStorageSession::storageSession(m_sessionID)) {
+ storedCredential = storageSession->credentialStorage().getFromPersistentStorage(protectionSpace);
+ if (storedCredential.isEmpty())
+ storedCredential = storageSession->credentialStorage().get(protectionSpace);
+ }
</ins><span class="cx">
</span><span class="cx"> if (storedCredential.isEmpty())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandle.h 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -46,12 +46,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class NetworkingContext;
</del><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, SessionID) { return adoptRef(*new SocketStreamHandle(url, client)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID) { return adoptRef(*new SocketStreamHandle(url, client)); }
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -30,8 +30,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef SocketStreamHandle_h
-#define SocketStreamHandle_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "SocketStreamHandleBase.h"
</span><span class="cx">
</span><span class="lines">@@ -43,13 +42,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class NetworkingContext;
</del><span class="cx"> class SocketStreamError;
</span><span class="cx"> class SocketStreamHandleClient;
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle final : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL&, SocketStreamHandleClient&, NetworkingContext&, SessionID);
</del><ins>+ static Ref<SocketStreamHandle> create(const URL&, SocketStreamHandleClient&, SessionID);
</ins><span class="cx"> static Ref<SocketStreamHandle> create(GSocketConnection*, SocketStreamHandleClient&);
</span><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="lines">@@ -83,5 +81,3 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#endif // SocketStreamHandle_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SocketStreamHandle> SocketStreamHandle::create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, SessionID)
</del><ins>+Ref<SocketStreamHandle> SocketStreamHandle::create(const URL& url, SocketStreamHandleClient& client, SessionID)
</ins><span class="cx"> {
</span><span class="cx"> Ref<SocketStreamHandle> socket = adoptRef(*new SocketStreamHandle(url, client));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-08-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Don't use a NetworkingContext when creating SocketStreamHandles
+ https://bugs.webkit.org/show_bug.cgi?id=160732
+
+ Reviewed by Brady Eidson.
+
+ * WebProcess/Network/WebSocketProvider.cpp:
+ (WebKit::WebSocketProvider::createSocketStreamHandle):
+ * WebProcess/Network/WebSocketProvider.h:
+
+2016-08-11 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Use StringBuilder::appendLiteral when possible don't append result of makeString
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=160772
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebSocketProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.cpp (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.cpp 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.cpp 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-Ref<SocketStreamHandle> WebSocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, NetworkingContext& context, SessionID sessionID)
</del><ins>+Ref<SocketStreamHandle> WebSocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: This should return a proxy so we can do the actual network interactions in the NetworkProcess.
</span><del>- return SocketStreamHandle::create(url, client, context, sessionID);
</del><ins>+ return SocketStreamHandle::create(url, client, sessionID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebSocketProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h (204394 => 204395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h 2016-08-12 00:33:47 UTC (rev 204394)
+++ trunk/Source/WebKit2/WebProcess/Network/WebSocketProvider.h 2016-08-12 00:34:22 UTC (rev 204395)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>- Ref<WebCore::SocketStreamHandle> createSocketStreamHandle(const WebCore::URL&, WebCore::SocketStreamHandleClient&, WebCore::NetworkingContext&, WebCore::SessionID) final;
</del><ins>+ Ref<WebCore::SocketStreamHandle> createSocketStreamHandle(const WebCore::URL&, WebCore::SocketStreamHandleClient&, WebCore::SessionID) final;
</ins><span class="cx"> #endif
</span><span class="cx"> virtual ~WebSocketProvider() { }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>