Title: [246895] trunk/Source/WebKit
- Revision
- 246895
- Author
- [email protected]
- Date
- 2019-06-27 11:36:13 -0700 (Thu, 27 Jun 2019)
Log Message
Fix build after revision 246877
https://bugs.webkit.org/show_bug.cgi?id=199276
Unreviewed.
Pass protocol parameter to NetworkSocketChannel.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:webSocketTask:didOpenWithProtocol:]):
* NetworkProcess/cocoa/WebSocketTaskCocoa.h:
* NetworkProcess/cocoa/WebSocketTaskCocoa.mm:
(WebKit::WebSocketTask::didConnect):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246894 => 246895)
--- trunk/Source/WebKit/ChangeLog 2019-06-27 18:27:35 UTC (rev 246894)
+++ trunk/Source/WebKit/ChangeLog 2019-06-27 18:36:13 UTC (rev 246895)
@@ -1,3 +1,18 @@
+2019-06-27 Youenn Fablet <[email protected]>
+
+ Fix build after revision 246877
+ https://bugs.webkit.org/show_bug.cgi?id=199276
+
+ Unreviewed.
+
+ Pass protocol parameter to NetworkSocketChannel.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:webSocketTask:didOpenWithProtocol:]):
+ * NetworkProcess/cocoa/WebSocketTaskCocoa.h:
+ * NetworkProcess/cocoa/WebSocketTaskCocoa.mm:
+ (WebKit::WebSocketTask::didConnect):
+
2019-06-27 Beth Dakin <[email protected]>
Upstream use of MACCATALYST
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (246894 => 246895)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-06-27 18:27:35 UTC (rev 246894)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-06-27 18:36:13 UTC (rev 246895)
@@ -842,7 +842,7 @@
- (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)task didOpenWithProtocol:(NSString *) protocol
{
if (auto* webSocketTask = [self existingWebSocketTask:task])
- webSocketTask->didConnect();
+ webSocketTask->didConnect(protocol);
}
- (void)URLSession:(NSURLSession *)session webSocketTask:(NSURLSessionWebSocketTask *)task didCloseWithCode:(NSURLSessionWebSocketCloseCode)closeCode reason:(NSData *)reason
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h (246894 => 246895)
--- trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h 2019-06-27 18:27:35 UTC (rev 246894)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h 2019-06-27 18:36:13 UTC (rev 246895)
@@ -49,7 +49,7 @@
void sendData(const IPC::DataReference&, CompletionHandler<void()>&&);
void close(int32_t code, const String& reason);
- void didConnect();
+ void didConnect(const String&);
void didClose(unsigned short code, const String& reason);
void cancel();
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm (246894 => 246895)
--- trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm 2019-06-27 18:27:35 UTC (rev 246894)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm 2019-06-27 18:36:13 UTC (rev 246895)
@@ -82,9 +82,9 @@
[m_task resume];
}
-void WebSocketTask::didConnect()
+void WebSocketTask::didConnect(const String& protocol)
{
- m_channel.didConnect();
+ m_channel.didConnect(protocol);
}
void WebSocketTask::didClose(unsigned short code, const String& reason)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
