Title: [214685] tags/Safari-604.1.15.2/Source/WebKit2
- Revision
- 214685
- Author
- [email protected]
- Date
- 2017-03-31 14:18:07 -0700 (Fri, 31 Mar 2017)
Log Message
Cherry-pick r214616. rdar://problem/31284447
Modified Paths
Diff
Modified: tags/Safari-604.1.15.2/Source/WebKit2/ChangeLog (214684 => 214685)
--- tags/Safari-604.1.15.2/Source/WebKit2/ChangeLog 2017-03-31 20:18:05 UTC (rev 214684)
+++ tags/Safari-604.1.15.2/Source/WebKit2/ChangeLog 2017-03-31 21:18:07 UTC (rev 214685)
@@ -1,3 +1,18 @@
+2017-03-31 Jason Marcell <[email protected]>
+
+ Cherry-pick r214616. rdar://problem/31284447
+
+ 2017-03-30 Youenn Fablet <[email protected]>
+
+ NetworkConnectionToWebProcess should stop web sockets when being destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=170286
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkSocketStream.cpp:
+ (WebKit::NetworkSocketStream::~NetworkSocketStream): Stopping the socket handle if not done already.
+ * NetworkProcess/NetworkSocketStream.h:
+
2017-03-28 Timothy Horton <[email protected]>
Stop overriding scroll view inset defaults
Modified: tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.cpp (214684 => 214685)
--- tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.cpp 2017-03-31 20:18:05 UTC (rev 214684)
+++ tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.cpp 2017-03-31 21:18:07 UTC (rev 214685)
@@ -59,6 +59,11 @@
m_impl->platformClose();
}
+NetworkSocketStream::~NetworkSocketStream()
+{
+ close();
+}
+
void NetworkSocketStream::didOpenSocketStream(SocketStreamHandle& handle)
{
ASSERT_UNUSED(handle, &handle == m_impl.ptr());
Modified: tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.h (214684 => 214685)
--- tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.h 2017-03-31 20:18:05 UTC (rev 214684)
+++ tags/Safari-604.1.15.2/Source/WebKit2/NetworkProcess/NetworkSocketStream.h 2017-03-31 21:18:07 UTC (rev 214685)
@@ -47,7 +47,8 @@
class NetworkSocketStream : public RefCounted<NetworkSocketStream>, public IPC::MessageSender, public IPC::MessageReceiver, public WebCore::SocketStreamHandleClient {
public:
static Ref<NetworkSocketStream> create(WebCore::URL&&, WebCore::SessionID, const String& credentialPartition, uint64_t, IPC::Connection&);
-
+ ~NetworkSocketStream();
+
void didReceiveMessage(IPC::Connection&, IPC::Decoder&);
void sendData(const IPC::DataReference&, uint64_t);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
