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

Unified Diff: ppapi/proxy/websocket_resource.cc

Issue 15806016: Update ppapi/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « ppapi/proxy/video_source_resource.cc ('k') | ppapi/shared_impl/thread_aware_callback.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/websocket_resource.cc
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc
index 7439826dba18dc5596912d0e9bb0cbdbb24d59b8..004e648fd4d8b9ff7eac8686568cdeaf5ce372b1 100644
--- a/ppapi/proxy/websocket_resource.cc
+++ b/ppapi/proxy/websocket_resource.cc
@@ -89,7 +89,7 @@ int32_t WebSocketResource::Connect(
// Get the URL.
url_ = StringVar::FromPPVar(url);
- if (!url_)
+ if (!url_.get())
return PP_ERROR_BADARGUMENT;
// Get the protocols.
@@ -100,7 +100,7 @@ int32_t WebSocketResource::Connect(
scoped_refptr<StringVar> protocol(StringVar::FromPPVar(protocols[i]));
// Check invalid and empty entries.
- if (!protocol || !protocol->value().length())
+ if (!protocol.get() || !protocol->value().length())
return PP_ERROR_BADARGUMENT;
// Check duplicated protocol entries.
@@ -157,7 +157,7 @@ int32_t WebSocketResource::Close(uint16_t code,
if (reason.type != PP_VARTYPE_UNDEFINED) {
// Validate |reason|.
reason_string_var = StringVar::FromPPVar(reason);
- if (!reason_string_var ||
+ if (!reason_string_var.get() ||
reason_string_var->value().size() > kMaxReasonSizeInBytes)
return PP_ERROR_BADARGUMENT;
reason_string = reason_string_var->value();
@@ -246,12 +246,12 @@ int32_t WebSocketResource::SendMessage(const PP_Var& message) {
uint64_t payload_size = 0;
if (message.type == PP_VARTYPE_STRING) {
scoped_refptr<StringVar> message_string = StringVar::FromPPVar(message);
- if (message_string)
+ if (message_string.get())
payload_size += message_string->value().length();
} else if (message.type == PP_VARTYPE_ARRAY_BUFFER) {
scoped_refptr<ArrayBufferVar> message_array_buffer =
ArrayBufferVar::FromPPVar(message);
- if (message_array_buffer)
+ if (message_array_buffer.get())
payload_size += message_array_buffer->ByteLength();
} else {
// TODO(toyoshim): Support Blob.
@@ -268,14 +268,14 @@ int32_t WebSocketResource::SendMessage(const PP_Var& message) {
if (message.type == PP_VARTYPE_STRING) {
// Convert message to std::string, then send it.
scoped_refptr<StringVar> message_string = StringVar::FromPPVar(message);
- if (!message_string)
+ if (!message_string.get())
return PP_ERROR_BADARGUMENT;
Post(RENDERER, PpapiHostMsg_WebSocket_SendText(message_string->value()));
} else if (message.type == PP_VARTYPE_ARRAY_BUFFER) {
// Convert message to std::vector<uint8_t>, then send it.
scoped_refptr<ArrayBufferVar> message_arraybuffer =
ArrayBufferVar::FromPPVar(message);
- if (!message_arraybuffer)
+ if (!message_arraybuffer.get())
return PP_ERROR_BADARGUMENT;
uint8_t* message_data = static_cast<uint8_t*>(message_arraybuffer->Map());
uint32 message_length = message_arraybuffer->ByteLength();
@@ -298,7 +298,7 @@ uint16_t WebSocketResource::GetCloseCode() {
}
PP_Var WebSocketResource::GetCloseReason() {
- if (!close_reason_)
+ if (!close_reason_.get())
return empty_string_->GetPPVar();
return close_reason_->GetPPVar();
}
@@ -312,7 +312,7 @@ PP_Var WebSocketResource::GetExtensions() {
}
PP_Var WebSocketResource::GetProtocol() {
- if (!protocol_)
+ if (!protocol_.get())
return empty_string_->GetPPVar();
return protocol_->GetPPVar();
}
@@ -322,7 +322,7 @@ PP_WebSocketReadyState WebSocketResource::GetReadyState() {
}
PP_Var WebSocketResource::GetURL() {
- if (!url_)
+ if (!url_.get())
return empty_string_->GetPPVar();
return url_->GetPPVar();
}
« no previous file with comments | « ppapi/proxy/video_source_resource.cc ('k') | ppapi/shared_impl/thread_aware_callback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698