diff options
22 files changed, 55 insertions, 61 deletions
diff --git a/ppapi/host/resource_message_filter.cc b/ppapi/host/resource_message_filter.cc index ac9d324..9442ce0 100644 --- a/ppapi/host/resource_message_filter.cc +++ b/ppapi/host/resource_message_filter.cc @@ -40,7 +40,7 @@ void ResourceMessageFilter::OnFilterDestroyed() { bool ResourceMessageFilter::HandleMessage(const IPC::Message& msg, HostMessageContext* context) { scoped_refptr<base::TaskRunner> runner = OverrideTaskRunnerForMessage(msg); - if (runner) { + if (runner.get()) { // TODO(raymes): We need to make a copy so the context can be used on other // threads. It would be better to have a thread-safe refcounted context. HostMessageContext context_copy = *context; diff --git a/ppapi/proxy/pdf_resource.cc b/ppapi/proxy/pdf_resource.cc index 07d343094..3da1070 100644 --- a/ppapi/proxy/pdf_resource.cc +++ b/ppapi/proxy/pdf_resource.cc @@ -124,7 +124,7 @@ void PDFResource::HistogramPDFPageCount(int count) { void PDFResource::UserMetricsRecordAction(const PP_Var& action) { scoped_refptr<ppapi::StringVar> action_str( ppapi::StringVar::FromPPVar(action)); - if (action_str) { + if (action_str.get()) { Post(RENDERER, PpapiHostMsg_PDF_UserMetricsRecordAction(action_str->value())); } diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc index d479ec7..58e3680 100644 --- a/ppapi/proxy/plugin_dispatcher.cc +++ b/ppapi/proxy/plugin_dispatcher.cc @@ -59,7 +59,7 @@ InstanceData::InstanceData() InstanceData::~InstanceData() { // Run any pending mouse lock callback to prevent leaks. - if (mouse_lock_callback) + if (mouse_lock_callback.get()) mouse_lock_callback->Abort(); } diff --git a/ppapi/proxy/plugin_globals.cc b/ppapi/proxy/plugin_globals.cc index 3083832..fba5b1f 100644 --- a/ppapi/proxy/plugin_globals.cc +++ b/ppapi/proxy/plugin_globals.cc @@ -76,7 +76,7 @@ PluginGlobals::~PluginGlobals() { // count, so this will delete the MessageLoop resource. We do this before // we clear plugin_globals_, because the Resource destructor tries to access // this PluginGlobals. - DCHECK(!loop_for_main_thread_ || loop_for_main_thread_->HasOneRef()); + DCHECK(!loop_for_main_thread_.get() || loop_for_main_thread_->HasOneRef()); loop_for_main_thread_ = NULL; } plugin_globals_ = NULL; diff --git a/ppapi/proxy/plugin_var_tracker.cc b/ppapi/proxy/plugin_var_tracker.cc index 585454b..ee29985 100644 --- a/ppapi/proxy/plugin_var_tracker.cc +++ b/ppapi/proxy/plugin_var_tracker.cc @@ -57,7 +57,7 @@ PP_Var PluginVarTracker::ReceiveObjectPassRef(const PP_Var& host_var, // two references on our behalf. We want to transfer that extra reference // to our list. This means we addref in the plugin, and release the extra // one in the renderer. - SendReleaseObjectMsg(*object); + SendReleaseObjectMsg(*object.get()); } info.ref_count++; return ret; diff --git a/ppapi/proxy/plugin_var_tracker_unittest.cc b/ppapi/proxy/plugin_var_tracker_unittest.cc index 83ce6be..f43d7a8 100644 --- a/ppapi/proxy/plugin_var_tracker_unittest.cc +++ b/ppapi/proxy/plugin_var_tracker_unittest.cc @@ -199,11 +199,9 @@ TEST_F(PluginVarTrackerTest, PluginObjectInstanceDeleted) { // Make a var with one reference. scoped_refptr<ProxyObjectVar> object( new ProxyObjectVar(plugin_dispatcher(), host_object.value.as_id)); - PP_Var plugin_var = MakeObject(var_tracker().AddVar(object)); - var_tracker().PluginImplementedObjectCreated(pp_instance, - plugin_var, - &mark_on_deallocate_class, - user_data); + PP_Var plugin_var = MakeObject(var_tracker().AddVar(object.get())); + var_tracker().PluginImplementedObjectCreated( + pp_instance, plugin_var, &mark_on_deallocate_class, user_data); // Release the plugin ref to the var. WebKit hasn't called destroy so // we won't get a destroy call. @@ -230,11 +228,9 @@ TEST_F(PluginVarTrackerTest, PluginObjectLeaked) { // Make a var with one reference. scoped_refptr<ProxyObjectVar> object( new ProxyObjectVar(plugin_dispatcher(), host_object.value.as_id)); - PP_Var plugin_var = MakeObject(var_tracker().AddVar(object)); - var_tracker().PluginImplementedObjectCreated(pp_instance, - plugin_var, - &mark_on_deallocate_class, - user_data); + PP_Var plugin_var = MakeObject(var_tracker().AddVar(object.get())); + var_tracker().PluginImplementedObjectCreated( + pp_instance, plugin_var, &mark_on_deallocate_class, user_data); // Destroy the instance. This should not call deallocate since the plugin // still has a ref. diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 528d8e7..4009a19 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc @@ -411,7 +411,7 @@ Resource* PPB_Instance_Proxy::GetSingletonResource(PP_Instance instance, #endif // !defined(OS_NACL) && !defined(NACL_WIN64) } - if (!new_singleton) { + if (!new_singleton.get()) { // Getting here implies that a constructor is missing in the above switch. NOTREACHED(); return NULL; diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc index fb01485..63d465a 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_message_loop_proxy.cc @@ -177,10 +177,9 @@ void MessageLoopResource::PostClosure( const tracked_objects::Location& from_here, const base::Closure& closure, int64 delay_ms) { - if (loop_proxy_) { - loop_proxy_->PostDelayedTask(from_here, - closure, - base::TimeDelta::FromMilliseconds(delay_ms)); + if (loop_proxy_.get()) { + loop_proxy_->PostDelayedTask( + from_here, closure, base::TimeDelta::FromMilliseconds(delay_ms)); } else { TaskInfo info; info.from_here = FROM_HERE; diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc index 363ac7a..95f748d 100644 --- a/ppapi/proxy/resource_creation_proxy.cc +++ b/ppapi/proxy/resource_creation_proxy.cc @@ -227,9 +227,9 @@ PP_Resource ResourceCreationProxy::CreateFileChooser( PP_FileChooserMode_Dev mode, const PP_Var& accept_types) { scoped_refptr<StringVar> string_var = StringVar::FromPPVar(accept_types); - std::string str = string_var ? string_var->value() : std::string(); - return (new FileChooserResource(GetConnection(), instance, mode, - str.c_str()))->GetReference(); + std::string str = string_var.get() ? string_var->value() : std::string(); + return (new FileChooserResource(GetConnection(), instance, mode, str.c_str())) + ->GetReference(); } PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance, diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc index 2f4a396..1217a83 100644 --- a/ppapi/proxy/serialized_var.cc +++ b/ppapi/proxy/serialized_var.cc @@ -56,7 +56,7 @@ SerializedVar::Inner::~Inner() { } PP_Var SerializedVar::Inner::GetVar() { - DCHECK(serialization_rules_); + DCHECK(serialization_rules_.get()); #if defined(NACL_WIN64) NOTREACHED(); @@ -74,7 +74,7 @@ PP_Var SerializedVar::Inner::GetVar() { void SerializedVar::Inner::SetVar(PP_Var var) { // Sanity check, when updating the var we should have received a // serialization rules pointer already. - DCHECK(serialization_rules_); + DCHECK(serialization_rules_.get()); var_ = var; raw_var_data_.reset(NULL); } @@ -100,7 +100,7 @@ void SerializedVar::Inner::WriteToMessage(IPC::Message* m) const { // that returns a var. This means the message handler didn't write to the // output parameter, or possibly you used the wrong helper class // (normally SerializedVarReturnValue). - DCHECK(serialization_rules_); + DCHECK(serialization_rules_.get()); #ifndef NDEBUG // We should only be serializing something once. diff --git a/ppapi/proxy/serialized_var.h b/ppapi/proxy/serialized_var.h index 7c3349f..98cafa0 100644 --- a/ppapi/proxy/serialized_var.h +++ b/ppapi/proxy/serialized_var.h @@ -104,7 +104,7 @@ class PPAPI_PROXY_EXPORT SerializedVar { ~Inner(); VarSerializationRules* serialization_rules() { - return serialization_rules_; + return serialization_rules_.get(); } void set_serialization_rules(VarSerializationRules* serialization_rules) { serialization_rules_ = serialization_rules; diff --git a/ppapi/proxy/truetype_font_singleton_resource.cc b/ppapi/proxy/truetype_font_singleton_resource.cc index 1fee97b..027557e 100644 --- a/ppapi/proxy/truetype_font_singleton_resource.cc +++ b/ppapi/proxy/truetype_font_singleton_resource.cc @@ -49,7 +49,7 @@ int32_t TrueTypeFontSingletonResource::GetFontsInFamily( const scoped_refptr<TrackedCallback>& callback) { scoped_refptr<StringVar> family_var = StringVar::FromPPVar(family); const uint32_t kMaxFamilySizeInBytes = 1024; - if (!family_var || family_var->value().size() > kMaxFamilySizeInBytes) + if (!family_var.get() || family_var->value().size() > kMaxFamilySizeInBytes) return PP_ERROR_BADARGUMENT; Call<PpapiPluginMsg_TrueTypeFontSingleton_GetFontsInFamilyReply>(BROWSER, PpapiHostMsg_TrueTypeFontSingleton_GetFontsInFamily(family_var->value()), diff --git a/ppapi/proxy/url_loader_resource.cc b/ppapi/proxy/url_loader_resource.cc index 5ee8d95..5bbc937 100644 --- a/ppapi/proxy/url_loader_resource.cc +++ b/ppapi/proxy/url_loader_resource.cc @@ -325,7 +325,7 @@ void URLLoaderResource::SetDefersLoading(bool defers_loading) { int32_t URLLoaderResource::ValidateCallback( scoped_refptr<TrackedCallback> callback) { - DCHECK(callback); + DCHECK(callback.get()); if (TrackedCallback::IsPending(pending_callback_)) return PP_ERROR_INPROGRESS; return PP_OK; diff --git a/ppapi/proxy/video_destination_resource.cc b/ppapi/proxy/video_destination_resource.cc index b08d063..5175705 100644 --- a/ppapi/proxy/video_destination_resource.cc +++ b/ppapi/proxy/video_destination_resource.cc @@ -47,7 +47,7 @@ int32_t VideoDestinationResource::Open( scoped_refptr<StringVar> stream_url_var = StringVar::FromPPVar(stream_url); const uint32_t kMaxStreamIdSizeInBytes = 16384; - if (!stream_url_var || + if (!stream_url_var.get() || stream_url_var->value().size() > kMaxStreamIdSizeInBytes) return PP_ERROR_BADARGUMENT; Call<PpapiPluginMsg_VideoDestination_OpenReply>(RENDERER, diff --git a/ppapi/proxy/video_source_resource.cc b/ppapi/proxy/video_source_resource.cc index 3bce63d..0c3b192 100644 --- a/ppapi/proxy/video_source_resource.cc +++ b/ppapi/proxy/video_source_resource.cc @@ -47,7 +47,7 @@ int32_t VideoSourceResource::Open( scoped_refptr<StringVar> stream_url_var = StringVar::FromPPVar(stream_url); const uint32_t kMaxStreamIdSizeInBytes = 16384; - if (!stream_url_var || + if (!stream_url_var.get() || stream_url_var->value().size() > kMaxStreamIdSizeInBytes) return PP_ERROR_BADARGUMENT; Call<PpapiPluginMsg_VideoSource_OpenReply>(RENDERER, diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc index 7439826..004e648 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(); } diff --git a/ppapi/shared_impl/thread_aware_callback.cc b/ppapi/shared_impl/thread_aware_callback.cc index 9b1063b..06e722a 100644 --- a/ppapi/shared_impl/thread_aware_callback.cc +++ b/ppapi/shared_impl/thread_aware_callback.cc @@ -49,7 +49,7 @@ bool ThreadAwareCallbackBase::HasTargetLoop() { void ThreadAwareCallbackBase::InternalRunOnTargetThread( const base::Closure& closure) { - if (target_loop_ != PpapiGlobals::Get()->GetCurrentMessageLoop()) { + if (target_loop_.get() != PpapiGlobals::Get()->GetCurrentMessageLoop()) { target_loop_->PostClosure( FROM_HERE, RunWhileLocked(base::Bind(&Core::RunIfNotAborted, core_, closure)), diff --git a/ppapi/shared_impl/tracked_callback.cc b/ppapi/shared_impl/tracked_callback.cc index b4cf9e5..c580f50 100644 --- a/ppapi/shared_impl/tracked_callback.cc +++ b/ppapi/shared_impl/tracked_callback.cc @@ -123,8 +123,8 @@ void TrackedCallback::Run(int32_t result) { } else { // If there's a target_loop_, and we're not on the right thread, we need to // post to target_loop_. - if (target_loop_ && - target_loop_ != PpapiGlobals::Get()->GetCurrentMessageLoop()) { + if (target_loop_.get() && + target_loop_.get() != PpapiGlobals::Get()->GetCurrentMessageLoop()) { PostRun(result); return; } @@ -152,7 +152,7 @@ void TrackedCallback::PostRun(int32_t result) { base::Closure callback_closure( RunWhileLocked(base::Bind(&TrackedCallback::Run, this, result))); - if (!target_loop_) { + if (!target_loop_.get()) { // We must be running in-process and on the main thread (the Enter // classes protect against having a null target_loop_ otherwise). DCHECK(IsMainThread()); diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h index 03bf162..79e84f6 100644 --- a/ppapi/shared_impl/tracked_callback.h +++ b/ppapi/shared_impl/tracked_callback.h @@ -117,9 +117,7 @@ class PPAPI_SHARED_EXPORT TrackedCallback return (callback_.func && (callback_.flags & PP_COMPLETIONCALLBACK_FLAG_OPTIONAL)); } - bool has_null_target_loop() const { - return target_loop_ == NULL; - } + bool has_null_target_loop() const { return target_loop_.get() == NULL; } private: // TrackedCallback and EnterBase manage dealing with how to invoke callbacks diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc index 0aff583..c872738 100644 --- a/ppapi/shared_impl/var.cc +++ b/ppapi/shared_impl/var.cc @@ -157,7 +157,7 @@ PP_Var StringVar::StringToPPVar(const std::string& var) { // static PP_Var StringVar::StringToPPVar(const char* data, uint32 len) { scoped_refptr<StringVar> str(new StringVar(data, len)); - if (!str || !IsStringUTF8(str->value())) + if (!str.get() || !IsStringUTF8(str->value())) return PP_MakeNull(); return str->GetPPVar(); } @@ -168,7 +168,7 @@ StringVar* StringVar::FromPPVar(PP_Var var) { return NULL; scoped_refptr<Var> var_object( PpapiGlobals::Get()->GetVarTracker()->GetVar(var)); - if (!var_object) + if (!var_object.get()) return NULL; return var_object->AsStringVar(); } @@ -202,7 +202,7 @@ ArrayBufferVar* ArrayBufferVar::FromPPVar(PP_Var var) { return NULL; scoped_refptr<Var> var_object( PpapiGlobals::Get()->GetVarTracker()->GetVar(var)); - if (!var_object) + if (!var_object.get()) return NULL; return var_object->AsArrayBufferVar(); } diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc index 7ff7462..771cde4 100644 --- a/ppapi/shared_impl/var_tracker.cc +++ b/ppapi/shared_impl/var_tracker.cc @@ -199,7 +199,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) { CheckThreadingPreconditions(); scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes)); - if (!array_buffer) + if (!array_buffer.get()) return PP_MakeNull(); return array_buffer->GetPPVar(); } @@ -229,7 +229,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes, scoped_refptr<ArrayBufferVar> array_buffer( CreateShmArrayBuffer(size_in_bytes, handle)); - if (!array_buffer) + if (!array_buffer.get()) return PP_MakeNull(); return array_buffer->GetPPVar(); } diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc index 02151eb..6b4bbbe 100644 --- a/ppapi/thunk/enter.cc +++ b/ppapi/thunk/enter.cc @@ -73,12 +73,13 @@ EnterBase::~EnterBase() { // callback_ is cleared any time it is run, scheduled to be run, or once we // know it will be completed asynchronously. So by this point it should be // NULL. - DCHECK(!callback_) << "|callback_| is not NULL. Did you forget to call " - "|EnterBase::SetResult| in the interface's thunk?"; + DCHECK(!callback_.get()) + << "|callback_| is not NULL. Did you forget to call " + "|EnterBase::SetResult| in the interface's thunk?"; } int32_t EnterBase::SetResult(int32_t result) { - if (!callback_) { + if (!callback_.get()) { // It doesn't make sense to call SetResult if there is no callback. NOTREACHED(); retval_ = result; @@ -132,7 +133,7 @@ void EnterBase::SetStateForCallbackError(bool report_error) { // In-process plugins can't make PPAPI calls off the main thread. CHECK(IsMainThread()); } - if (callback_) { + if (callback_.get()) { if (callback_->is_blocking() && IsMainThread()) { // Blocking callbacks are never allowed on the main thread. callback_->MarkAsCompleted(); @@ -193,12 +194,12 @@ void EnterBase::SetStateForResourceError(PP_Resource pp_resource, if (object) return; // Everything worked. - if (callback_ && callback_->is_required()) { + if (callback_.get() && callback_->is_required()) { callback_->PostRun(static_cast<int32_t>(PP_ERROR_BADRESOURCE)); callback_ = NULL; retval_ = PP_OK_COMPLETIONPENDING; } else { - if (callback_) + if (callback_.get()) callback_->MarkAsCompleted(); callback_ = NULL; retval_ = PP_ERROR_BADRESOURCE; @@ -235,12 +236,12 @@ void EnterBase::SetStateForFunctionError(PP_Instance pp_instance, if (object) return; // Everything worked. - if (callback_ && callback_->is_required()) { + if (callback_.get() && callback_->is_required()) { callback_->PostRun(static_cast<int32_t>(PP_ERROR_BADARGUMENT)); callback_ = NULL; retval_ = PP_OK_COMPLETIONPENDING; } else { - if (callback_) + if (callback_.get()) callback_->MarkAsCompleted(); callback_ = NULL; retval_ = PP_ERROR_BADARGUMENT; |