Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: net/websockets/websocket_frame.h

Issue 1399303002: net/websockets: Convert int types from basictypes.h to the ones from stdint.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: websocket_deflate_stream.cc Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_event_interface.h ('k') | net/websockets/websocket_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_frame.h
diff --git a/net/websockets/websocket_frame.h b/net/websockets/websocket_frame.h
index c9d8b976926c5d2ad4e9ec7cd8b4d53e50a11067..e3ceec5cc7975dd01cc9b28daf7d113a448473d9 100644
--- a/net/websockets/websocket_frame.h
+++ b/net/websockets/websocket_frame.h
@@ -5,6 +5,7 @@
#ifndef NET_WEBSOCKETS_WEBSOCKET_FRAME_H_
#define NET_WEBSOCKETS_WEBSOCKET_FRAME_H_
+#include <stdint.h>
#include <vector>
#include "base/basictypes.h"
@@ -83,7 +84,7 @@ struct NET_EXPORT WebSocketFrameHeader {
bool reserved3;
OpCode opcode;
bool masked;
- uint64 payload_length;
+ uint64_t payload_length;
private:
DISALLOW_COPY_AND_ASSIGN(WebSocketFrameHeader);
@@ -186,7 +187,7 @@ NET_EXPORT WebSocketMaskingKey GenerateWebSocketMaskingKey();
// used for unmasking a WebSocket frame.
NET_EXPORT void MaskWebSocketFramePayload(
const WebSocketMaskingKey& masking_key,
- uint64 frame_offset,
+ uint64_t frame_offset,
char* data,
int data_size);
« no previous file with comments | « net/websockets/websocket_event_interface.h ('k') | net/websockets/websocket_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698