| Index: public/platform/WebSocketHandle.h
|
| diff --git a/public/platform/WebSocketHandle.h b/public/platform/WebSocketHandle.h
|
| index f721891ace4ee332b73afa21484e67a2e28aba0b..4eed84647ea0afabfe1fbe87b2afcfc05e4ac185 100644
|
| --- a/public/platform/WebSocketHandle.h
|
| +++ b/public/platform/WebSocketHandle.h
|
| @@ -31,8 +31,9 @@
|
| #ifndef WebSocketHandle_h
|
| #define WebSocketHandle_h
|
|
|
| -#include "WebCommon.h"
|
| -#include "WebVector.h"
|
| +#include "public/platform/WebCommon.h"
|
| +#include "public/platform/WebSerializedOrigin.h"
|
| +#include "public/platform/WebVector.h"
|
|
|
| namespace blink {
|
|
|
| @@ -58,7 +59,16 @@ public:
|
|
|
| virtual ~WebSocketHandle() { }
|
|
|
| - virtual void connect(const WebURL& /* url */, const WebVector<WebString>& protocols, const WebString& origin, WebSocketHandleClient*) = 0;
|
| + virtual void connect(const WebURL& url, const WebVector<WebString>& protocols, const WebString& origin, WebSocketHandleClient* client)
|
| + {
|
| + // This method is not pure-virtual to avoid a compile error during
|
| + // the transition from connect(..., WebString, ...) to
|
| + // connect(..., WebSerializedOrigin, ...).
|
| + }
|
| + virtual void connect(const WebURL& url, const WebVector<WebString>& protocols, const WebSerializedOrigin& origin, WebSocketHandleClient* client)
|
| + {
|
| + this->connect(url, protocols, origin.string(), client);
|
| + }
|
| virtual void send(bool fin, MessageType, const char* data, size_t /* size */) = 0;
|
| virtual void flowControl(int64_t quota) = 0;
|
| virtual void close(unsigned short code, const WebString& reason) = 0;
|
|
|