| Index: third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h
|
| diff --git a/third_party/WebKit/public/platform/modules/websockets/WebSocketHandleClient.h b/third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h
|
| similarity index 81%
|
| rename from third_party/WebKit/public/platform/modules/websockets/WebSocketHandleClient.h
|
| rename to third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h
|
| index 249d5d02cb289fbbe7555b5d9e50261d518c87c9..765e9f90d685317d620c0ba347cef4076c33bfbb 100644
|
| --- a/third_party/WebKit/public/platform/modules/websockets/WebSocketHandleClient.h
|
| +++ b/third_party/WebKit/Source/modules/websockets/WebSocketHandleClient.h
|
| @@ -31,28 +31,26 @@
|
| #ifndef WebSocketHandleClient_h
|
| #define WebSocketHandleClient_h
|
|
|
| -#include "public/platform/WebCommon.h"
|
| -#include "public/platform/WebString.h"
|
| -#include "public/platform/modules/websockets/WebSocketHandle.h"
|
| +#include "modules/websockets/WebSocketHandle.h"
|
| +#include "wtf/Forward.h"
|
|
|
| namespace blink {
|
| -
|
| -class WebSocketHandshakeRequestInfo;
|
| -class WebSocketHandshakeResponseInfo;
|
| +class WebSocketHandshakeRequest;
|
| +class WebSocketHandshakeResponse;
|
|
|
| class WebSocketHandleClient {
|
| public:
|
| // Called when the handle is opened.
|
| - virtual void didConnect(WebSocketHandle*, const WebString& selectedProtocol, const WebString& extensions) = 0;
|
| + virtual void didConnect(WebSocketHandle*, const String& selectedProtocol, const String& extensions) = 0;
|
|
|
| // Called when the browser starts the opening handshake.
|
| // This notification can be omitted when the inspector is not active.
|
| - virtual void didStartOpeningHandshake(WebSocketHandle*, const WebSocketHandshakeRequestInfo&) = 0;
|
| + virtual void didStartOpeningHandshake(WebSocketHandle*, PassRefPtr<WebSocketHandshakeRequest>) = 0;
|
|
|
| // Called when the browser finishes the opening handshake.
|
| // This notification precedes didConnect.
|
| // This notification can be omitted when the inspector is not active.
|
| - virtual void didFinishOpeningHandshake(WebSocketHandle*, const WebSocketHandshakeResponseInfo&) = 0;
|
| + virtual void didFinishOpeningHandshake(WebSocketHandle*, const WebSocketHandshakeResponse*) = 0;
|
|
|
| // Called when the browser is required to fail the connection.
|
| // |message| can be displayed in the inspector, but should not be passed
|
| @@ -60,14 +58,14 @@ public:
|
| // This message also implies that channel is closed with
|
| // (wasClean = false, code = 1006, reason = "") and
|
| // |handle| becomes unavailable.
|
| - virtual void didFail(WebSocketHandle* /* handle */, const WebString& message) = 0;
|
| + virtual void didFail(WebSocketHandle* /* handle */, const String& message) = 0;
|
|
|
| // Called when data are received.
|
| - virtual void didReceiveData(WebSocketHandle*, bool fin, WebSocketHandle::MessageType, const char* data, size_t /* size */) = 0;
|
| + virtual void didReceiveData(WebSocketHandle*, bool fin, WebSocketHandle::MessageType, const char* data, size_t) = 0;
|
|
|
| // Called when the handle is closed.
|
| // |handle| becomes unavailable once this notification arrives.
|
| - virtual void didClose(WebSocketHandle* /* handle */, bool wasClean, unsigned short code, const WebString& reason) = 0;
|
| + virtual void didClose(WebSocketHandle* /* handle */, bool wasClean, unsigned short code, const String& reason) = 0;
|
|
|
| virtual void didReceiveFlowControl(WebSocketHandle*, int64_t quota) = 0;
|
|
|
|
|