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

Unified Diff: ppapi/shared_impl/var.cc

Issue 7621054: Don't use a scoped_refptr for StringVar::FromPPVar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/shared_impl/var.h ('k') | webkit/plugins/ppapi/message_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/var.cc
diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc
index af63b0b1a07299a07b7dd7f4057ebd5f28c2104b..0542e508948747d1d2aece55aa59ab29bba053a7 100644
--- a/ppapi/shared_impl/var.cc
+++ b/ppapi/shared_impl/var.cc
@@ -37,7 +37,7 @@ std::string Var::PPVarToLogString(PP_Var var) {
case PP_VARTYPE_DOUBLE:
return base::DoubleToString(var.value.as_double);
case PP_VARTYPE_STRING: {
- scoped_refptr<StringVar> string(StringVar::FromPPVar(var));
+ StringVar* string(StringVar::FromPPVar(var));
if (!string)
return "[Invalid string]";
@@ -139,14 +139,14 @@ PP_Var StringVar::StringToPPVar(PP_Module module,
}
// static
-scoped_refptr<StringVar> StringVar::FromPPVar(PP_Var var) {
+StringVar* StringVar::FromPPVar(PP_Var var) {
if (var.type != PP_VARTYPE_STRING)
- return scoped_refptr<StringVar>();
+ return NULL;
scoped_refptr<Var> var_object(
TrackerBase::Get()->GetVarTracker()->GetVar(var));
if (!var_object)
- return scoped_refptr<StringVar>();
- return scoped_refptr<StringVar>(var_object->AsStringVar());
+ return NULL;
+ return var_object->AsStringVar();
}
} // namespace ppapi
« no previous file with comments | « ppapi/shared_impl/var.h ('k') | webkit/plugins/ppapi/message_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698