Title: [202620] trunk/Source/WebCore
- Revision
- 202620
- Author
- [email protected]
- Date
- 2016-06-29 04:52:32 -0700 (Wed, 29 Jun 2016)
Log Message
Fix assertion in debug build when creating the SocketStreamHandle object.
We have to call relaxAdoptionRequirement to avoid the assertion
when protecting the non-adopted SocketStreamHandle we are
creating. Update to r202370.
Rubber-stamped by Carlos Garcia Campos.
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202619 => 202620)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 10:31:40 UTC (rev 202619)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 11:52:32 UTC (rev 202620)
@@ -1,3 +1,16 @@
+2016-06-29 Alejandro G. Castro <[email protected]>
+
+ Fix assertion in debug build when creating the SocketStreamHandle object.
+
+ We have to call relaxAdoptionRequirement to avoid the assertion
+ when protecting the non-adopted SocketStreamHandle we are
+ creating. Update to r202370.
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+
2016-06-29 David Kilzer <[email protected]>
Throw exceptions for invalid number of channels for ConvolverNode
Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (202619 => 202620)
--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-29 10:31:40 UTC (rev 202619)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-29 11:52:32 UTC (rev 202620)
@@ -58,6 +58,7 @@
GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
if (url.protocolIs("wss"))
g_socket_client_set_tls(socketClient.get(), TRUE);
+ relaxAdoptionRequirement();
RefPtr<SocketStreamHandle> protectedThis(this);
g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, m_cancellable.get(),
reinterpret_cast<GAsyncReadyCallback>(connectedCallback), protectedThis.leakRef());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
