Changeset 246895 in webkit


Ignore:
Timestamp:
Jun 27, 2019 11:36:13 AM (5 years ago)
Author:
youenn@apple.com
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):

Location:
trunk/Source/WebKit
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r246892 r246895  
     12019-06-27  Youenn Fablet  <youenn@apple.com>
     2
     3        Fix build after revision 246877
     4        https://bugs.webkit.org/show_bug.cgi?id=199276
     5
     6        Unreviewed.
     7
     8        Pass protocol parameter to NetworkSocketChannel.
     9
     10        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
     11        (-[WKNetworkSessionDelegate URLSession:webSocketTask:didOpenWithProtocol:]):
     12        * NetworkProcess/cocoa/WebSocketTaskCocoa.h:
     13        * NetworkProcess/cocoa/WebSocketTaskCocoa.mm:
     14        (WebKit::WebSocketTask::didConnect):
     15
    1162019-06-27  Beth Dakin  <bdakin@apple.com>
    217

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

    r246616 r246895  
    843843{
    844844    if (auto* webSocketTask = [self existingWebSocketTask:task])
    845         webSocketTask->didConnect();
     845        webSocketTask->didConnect(protocol);
    846846}
    847847

  • trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.h

    r246388 r246895  
    5050    void close(int32_t code, const String& reason);
    5151
    52     void didConnect();
     52    void didConnect(const String&);
    5353    void didClose(unsigned short code, const String& reason);
    5454

  • trunk/Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm

    r246388 r246895  
    8383}
    8484
    85 void WebSocketTask::didConnect()
     85void WebSocketTask::didConnect(const String& protocol)
    8686{
    87     m_channel.didConnect();
     87    m_channel.didConnect(protocol);
    8888}
    8989
Note: See TracChangeset for help on using the changeset viewer.