Change unsigned long to uint64_t in third_party/blink/public/web/web_pepper_socket_client.h
- unsigned long -> uint64_t for buffer amount to make a consistence with //blink & //ppapi
- unsigned short -> uint16_t, size_t -> unsigned
- Reference: https://google.github.io/styleguide/cppguide.html#Integer_Types
Bug: 930252
Change-Id: Ia5cc8df0fc109ccfc86c208474bb36f3f7e95aa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1530212
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#642264}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7caefcaeb6f5181cad67c44e5fd7bc506a816d70
diff --git a/proxy/websocket_resource.cc b/proxy/websocket_resource.cc
index 02b918e..8c0c958 100644
--- a/proxy/websocket_resource.cc
+++ b/proxy/websocket_resource.cc
@@ -375,9 +375,9 @@
void WebSocketResource::OnPluginMsgCloseReply(
const ResourceMessageReplyParams& params,
- unsigned long buffered_amount,
+ uint64_t buffered_amount,
bool was_clean,
- unsigned short code,
+ uint16_t code,
const std::string& reason) {
// Set close related properties.
state_ = PP_WEBSOCKETREADYSTATE_CLOSED;
@@ -457,7 +457,7 @@
void WebSocketResource::OnPluginMsgBufferedAmountReply(
const ResourceMessageReplyParams& params,
- unsigned long buffered_amount) {
+ uint64_t buffered_amount) {
buffered_amount_ = buffered_amount;
}
@@ -469,9 +469,9 @@
void WebSocketResource::OnPluginMsgClosedReply(
const ResourceMessageReplyParams& params,
- unsigned long buffered_amount,
+ uint64_t buffered_amount,
bool was_clean,
- unsigned short code,
+ uint16_t code,
const std::string& reason) {
OnPluginMsgCloseReply(params, buffered_amount, was_clean, code, reason);
}
diff --git a/proxy/websocket_resource.h b/proxy/websocket_resource.h
index b5580c8..b50b385 100644
--- a/proxy/websocket_resource.h
+++ b/proxy/websocket_resource.h
@@ -63,9 +63,9 @@
const std::string& url,
const std::string& protocol);
void OnPluginMsgCloseReply(const ResourceMessageReplyParams& params,
- unsigned long buffered_amount,
+ uint64_t buffered_amount,
bool was_clean,
- unsigned short code,
+ uint16_t code,
const std::string& reason);
void OnPluginMsgReceiveTextReply(const ResourceMessageReplyParams& params,
const std::string& message);
@@ -73,13 +73,13 @@
const std::vector<uint8_t>& message);
void OnPluginMsgErrorReply(const ResourceMessageReplyParams& params);
void OnPluginMsgBufferedAmountReply(const ResourceMessageReplyParams& params,
- unsigned long buffered_amount);
+ uint64_t buffered_amount);
void OnPluginMsgStateReply(const ResourceMessageReplyParams& params,
int32_t state);
void OnPluginMsgClosedReply(const ResourceMessageReplyParams& params,
- unsigned long buffered_amount,
+ uint64_t buffered_amount,
bool was_clean,
- unsigned short code,
+ uint16_t code,
const std::string& reason);
// Picks up a received message and moves it to user receiving buffer. This