| Index: webkit/plugins/ppapi/ppb_websocket_impl.h
|
| diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.h b/webkit/plugins/ppapi/ppb_websocket_impl.h
|
| index 672ba52aea7f289387fe842acd6c2f73e286b886..3ef6c08e315fd2a72da43460cebfb0744026b1c8 100644
|
| --- a/webkit/plugins/ppapi/ppb_websocket_impl.h
|
| +++ b/webkit/plugins/ppapi/ppb_websocket_impl.h
|
| @@ -66,14 +66,16 @@ class PPB_WebSocket_Impl : public ::ppapi::Resource,
|
| const WebKit::WebData& binaryData) OVERRIDE;
|
| virtual void didReceiveMessageError() OVERRIDE;
|
| // TODO(toyoshim): Add OVERRIDE after landing WebKit side change.
|
| - virtual void didUpdateBufferedAmount(unsigned long bufferedAmount);
|
| + virtual void didUpdateBufferedAmount(unsigned long buffered_amount);
|
| virtual void didStartClosingHandshake() OVERRIDE;
|
| - virtual void didClose(unsigned long bufferedAmount,
|
| + virtual void didClose(unsigned long buffered_amount,
|
| ClosingHandshakeCompletionStatus status,
|
| unsigned short code,
|
| const WebKit::WebString& reason) OVERRIDE;
|
| private:
|
| int32_t DoReceive();
|
| + uint64_t GetFrameSize(uint64_t payload_size);
|
| + uint64_t SaturateAdd(uint64_t a, uint64_t b);
|
|
|
| scoped_ptr<WebKit::WebSocket> websocket_;
|
| PP_WebSocketReadyState_Dev state_;
|
| @@ -96,6 +98,9 @@ class PPB_WebSocket_Impl : public ::ppapi::Resource,
|
| scoped_refptr< ::ppapi::StringVar> protocol_;
|
| scoped_refptr< ::ppapi::StringVar> url_;
|
|
|
| + uint64_t buffered_amount_;
|
| + uint64_t buffered_amount_after_close_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PPB_WebSocket_Impl);
|
| };
|
|
|
|
|