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

Unified Diff: net/websockets/websocket_deflate_stream.cc

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: 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
Index: net/websockets/websocket_deflate_stream.cc
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc
index cf1690356537137d6353a4f214f5cb31c5073b07..d0d757aa7cec8d3a154fa553003d58cffd49284e 100644
--- a/net/websockets/websocket_deflate_stream.cc
+++ b/net/websockets/websocket_deflate_stream.cc
@@ -242,7 +242,7 @@ int WebSocketDeflateStream::AppendPossiblyCompressedMessage(
return ERR_WS_PROTOCOL_ERROR;
}
- uint64 original_payload_length = 0;
+ uint64_t original_payload_length = 0;
for (size_t i = 0; i < frames->size(); ++i) {
WebSocketFrame* frame = (*frames)[i];
// Asserts checking that frames represent one whole data message.
@@ -254,7 +254,7 @@ int WebSocketDeflateStream::AppendPossiblyCompressedMessage(
original_payload_length += frame->header.payload_length;
}
if (original_payload_length <=
- static_cast<uint64>(compressed_payload->size())) {
+ static_cast<uint64_t>(compressed_payload->size())) {
// Compression is not effective. Use the original frames.
for (size_t i = 0; i < frames->size(); ++i) {
WebSocketFrame* frame = (*frames)[i];

Powered by Google App Engine
This is Rietveld 408576698