Attachment 373035 Details for Bug 199276 – Patch

[patch] Patch

bug-199276-20190627104537.patch (text/plain), 3.07 KB, created by youenn fablet on 2019-06-27 10:45:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-06-27 10:45:37 PDT

Size: 3.07 KB

patch

obsolete

>Subversion Revision: 246881
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a1bca918c58704b4334bdbd7b959d5e32b9f091b..7ca0b72822fdec42bedd3e3b6e478166f50f5386 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-27  Youenn Fablet  <youenn@apple.com>
>+
>+        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  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK][WPE] Fix build non-unified builds after r246856
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>index 0aa604539953fb3b124b07915bb70bf2672b5f2e..330e077f3f6665750ed9b63eefd989b75145d4b3 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>@@ -842,7 +842,7 @@ - (WebSocketTask*)existingWebSocketTask:(NSURLSessionWebSocketTask *)task
> - (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
>diff --git a/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h b/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h
>index 852fe52a7210bebf33a0bfef231264ff0f6a2d1f..937e28732be574326169d854df64c1513e2b68a3 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h
>+++ b/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h
>@@ -49,7 +49,7 @@ public:
>     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();
>diff --git a/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm
>index 2f167d331d79057a506d0a2f03b0f706ee865d6d..adc5cfea97c7bc8e5aa08115a7a53dfa4f6abe96 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm
>@@ -82,9 +82,9 @@ void WebSocketTask::resume()
>     [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)

Actions: View | Formatted Diff | Diff

Attachments on bug 199276: 373035