Remove special handling for strings in var serialization.

Previously we had to have a lot of weird string handling because strings needed a PP_Module to be constructed, and because they had different methods for being created in the host and the plugin processes. We've removed all of these limitations, so now we can just delete the whole mess.

Review URL: https://chromiumcodereview.appspot.com/9316123

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120724 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 17 insertions, 18 deletions

diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc
index d7b0dac..da7a2cb 100644
--- a/ppapi/shared_impl/var.cc
+++ b/ppapi/shared_impl/var.cc
@@ -113,6 +113,9 @@ void Var::AssignVarID(int32 id) {
 
 // StringVar -------------------------------------------------------------------
 
+StringVar::StringVar() {
+}
+
 StringVar::StringVar(const std::string& str)
     : value_(str) {
 }
@@ -124,11 +127,6 @@ StringVar::StringVar(const char* str, uint32 len)
 StringVar::~StringVar() {
 }
 
-StringVar::StringVar(scoped_ptr<std::string> str) {
-  // Swap the given string's contents in to value to avoid copying.
-  str->swap(value_);
-}
-
 StringVar* StringVar::AsStringVar() {
   return this;
 }
@@ -151,17 +149,6 @@ PP_Var StringVar::StringToPPVar(const char* data, uint32 len) {
 }
 
 // static
-PP_Var StringVar::StringToPPVar(scoped_ptr<std::string> str) {
-  DCHECK(str.get());
-  if (!str.get())
-    return PP_MakeNull();
-  scoped_refptr<StringVar> str_var(new StringVar(str.Pass()));
-  if (!str_var || !IsStringUTF8(str_var->value()))
-    return PP_MakeNull();
-  return str_var->GetPPVar();
-}
-
-// static
 StringVar* StringVar::FromPPVar(PP_Var var) {
   if (var.type != PP_VARTYPE_STRING)
     return NULL;
@@ -172,6 +159,13 @@ StringVar* StringVar::FromPPVar(PP_Var var) {
   return var_object->AsStringVar();
 }
 
+// static
+PP_Var StringVar::SwapValidatedUTF8StringIntoPPVar(std::string* src) {
+  scoped_refptr<StringVar> str(new StringVar);
+  str->value_.swap(*src);
+  return str->GetPPVar();
+}
+
 // ArrayBufferVar --------------------------------------------------------------
 
 ArrayBufferVar::ArrayBufferVar() {
diff --git a/ppapi/shared_impl/var.h b/ppapi/shared_impl/var.h
index ed7f4f1..d8084d7 100644
--- a/ppapi/shared_impl/var.h
+++ b/ppapi/shared_impl/var.h
@@ -94,7 +94,6 @@ class PPAPI_SHARED_EXPORT StringVar : public Var {
  public:
   StringVar(const std::string& str);
   StringVar(const char* str, uint32 len);
-  StringVar(scoped_ptr<std::string> str);
   virtual ~StringVar();
 
   const std::string& value() const { return value_; }
@@ -117,13 +116,19 @@ class PPAPI_SHARED_EXPORT StringVar : public Var {
   // create a StringVar and return the reference to it in the var.
   static PP_Var StringToPPVar(const std::string& str);
   static PP_Var StringToPPVar(const char* str, uint32 len);
-  static PP_Var StringToPPVar(scoped_ptr<std::string> str);
+
+  // Same as StringToPPVar but avoids a copy by destructively swapping the
+  // given string into the newly created StringVar. The string must already be
+  // valid UTF-8. After the call, *src will be empty.
+  static PP_Var SwapValidatedUTF8StringIntoPPVar(std::string* src);
 
   // Helper function that converts a PP_Var to a string. This will return NULL
   // if the PP_Var is not of string type or the string is invalid.
   static StringVar* FromPPVar(PP_Var var);
 
  private:
+  StringVar();  // Makes an empty string.
+
   std::string value_;
 
   DISALLOW_COPY_AND_ASSIGN(StringVar);