diff options
Diffstat (limited to 'chromium/net/websockets/websocket_frame_parser.h')
| -rw-r--r-- | chromium/net/websockets/websocket_frame_parser.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/net/websockets/websocket_frame_parser.h b/chromium/net/websockets/websocket_frame_parser.h index 52e6f85a6bb..250541b816a 100644 --- a/chromium/net/websockets/websocket_frame_parser.h +++ b/chromium/net/websockets/websocket_frame_parser.h @@ -5,12 +5,14 @@ #ifndef NET_WEBSOCKETS_WEBSOCKET_FRAME_PARSER_H_ #define NET_WEBSOCKETS_WEBSOCKET_FRAME_PARSER_H_ +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/memory/scoped_vector.h" #include "net/base/net_export.h" #include "net/websockets/websocket_errors.h" #include "net/websockets/websocket_frame.h" @@ -38,7 +40,7 @@ class NET_EXPORT WebSocketFrameParser { // websocket_frame.h for more details. bool Decode(const char* data, size_t length, - ScopedVector<WebSocketFrameChunk>* frame_chunks); + std::vector<scoped_ptr<WebSocketFrameChunk>>* frame_chunks); // Returns kWebSocketNormalClosure if the parser has not failed to decode // WebSocket frames. Otherwise returns WebSocketError which is defined in @@ -75,7 +77,7 @@ class NET_EXPORT WebSocketFrameParser { WebSocketMaskingKey masking_key_; // Amount of payload data read so far for the current frame. - uint64 frame_offset_; + uint64_t frame_offset_; WebSocketError websocket_error_; |