Bug 65374 – WebSocket: Rename SocketStreamHandleClient member functions

• Component: WebCore Misc.
• Status: RESOLVED FIXED

[Yuta Kitamura]

To implement WebSocket binary messages (bug 65249), I happened to know the names of SocketStreamHandleClient methods conflict with FileReaderLoaderClient methods (which will be used to load a Blob content).

SocketStreamHandleClient:
    virtual void didReceiveData(SocketStreamHandle*, const char*, int);
    virtual void didFail(SocketStreamHandle*, const SocketStreamError&);

FileReaderLoaderClient:
    virtual void didReceiveData();
    virtual void didFail();

I think it's impossible to write a class deriving from these classes (a method from one class may hide one from the other, maybe?). Even if it's valid, it's extremely confusing to have both, so I'd like to rename SocketStreamHandleClient methods to avoid this clash.

[Yuta Kitamura]

Created attachment 102357 [details]
Patch

[Kent Tamura]

Comment on attachment 102357 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=102357&action=review

> Source/WebCore/ChangeLog:3
> +        WebSocket: Rename SocketStreamHandleClient methods

nit: In C++, they are called "member function", not "method".

> Source/WebCore/ChangeLog:8
> +        Rename SocketStreamHandleClient methods to avoid conflict of the names of FileReaderLoaderClient methods.

ditto.

> Source/WebCore/websockets/WebSocketChannel.h:68
> +        // SocketStreamHandleClient methods.

ditto.

> Source/WebKit/chromium/ChangeLog:3
> +        WebSocket: Rename SocketStreamHandleClient methods

ditto.

[Yuta Kitamura]

Created attachment 102480 [details]
Patch for landing

[Yuta Kitamura]

Created attachment 102482 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 102482 [details]
Patch for landing

Clearing flags on attachment: 102482

Committed r92102: <http://trac.webkit.org/changeset/92102>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.