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

Unified Diff: webkit/plugins/ppapi/npapi_glue.cc

Issue 16155009: Update webkit/ 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 | « webkit/plugins/ppapi/content_decryptor_delegate.cc ('k') | webkit/plugins/ppapi/npobject_var.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/npapi_glue.cc
diff --git a/webkit/plugins/ppapi/npapi_glue.cc b/webkit/plugins/ppapi/npapi_glue.cc
index ed8d2cc13bd7de1f18b0a21353eb7cb0a8b39b66..3dcae6b0abfe41f91f52baf2333e8a516febd454 100644
--- a/webkit/plugins/ppapi/npapi_glue.cc
+++ b/webkit/plugins/ppapi/npapi_glue.cc
@@ -67,7 +67,7 @@ bool PPVarToNPVariant(PP_Var var, NPVariant* result) {
}
case PP_VARTYPE_OBJECT: {
scoped_refptr<NPObjectVar> object(NPObjectVar::FromPPVar(var));
- if (!object) {
+ if (!object.get()) {
VOID_TO_NPVARIANT(*result);
return false;
}
@@ -151,7 +151,7 @@ PP_Var NPObjectToPPVar(PluginInstance* instance, NPObject* object) {
scoped_refptr<NPObjectVar> object_var(
HostGlobals::Get()->host_var_tracker()->NPObjectVarForNPObject(
instance->pp_instance(), object));
- if (!object_var) { // No object for this module yet, make a new one.
+ if (!object_var.get()) { // No object for this module yet, make a new one.
object_var = new NPObjectVar(instance->pp_instance(), object);
}
return object_var->GetPPVar();
« no previous file with comments | « webkit/plugins/ppapi/content_decryptor_delegate.cc ('k') | webkit/plugins/ppapi/npobject_var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698