Inline StringValue into base::Value

base/values.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/values.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 70 matching lines @@
 }
 
 Value::Value(double in_double) : type_(TYPE_DOUBLE), double_value_(in_double) {
   if (!std::isfinite(double_value_)) {
     NOTREACHED() << "Non-finite (i.e. NaN or positive/negative infinity) "
                  << "values cannot be represented in JSON";
     double_value_ = 0.0;
   }
 }
 
+Value::Value(const char* in_string) : type_(TYPE_STRING) {
+  string_value_.Init(in_string);
+}
+
+Value::Value(StringPiece in_string) : type_(TYPE_STRING) {
+  string_value_.Init(in_string.as_string());
+  DCHECK(IsStringUTF8(in_string));
+}
+
+Value::Value(const string16& in_string) : type_(TYPE_STRING) {
+  string_value_.Init(UTF16ToUTF8(in_string));
+}
+
 Value::~Value() {
 }
 
 // static
 std::unique_ptr<Value> Value::CreateNullValue() {
   return WrapUnique(new Value(TYPE_NULL));
 }
 
 // static
 const char* Value::GetTypeName(Value::Type type) {
@@ skipping 14 matching lines @@
 
 double Value::GetDouble() const {
   if (is_double())
     return double_value_;
   if (is_int())
     return int_value_;
   CHECK(false);
   return 0.0;
 }
 
+std::string* Value::GetString() {
+  CHECK(is_string());
+  return string_value_.get();
+}
+
+const std::string& Value::GetString() const {
+  CHECK(is_string());
+  return *string_value_;
+}
+
 bool Value::GetAsBinary(const BinaryValue** out_value) const {
   return false;
 }
 
 bool Value::GetAsBoolean(bool* out_value) const {
   if (out_value && is_bool()) {
     *out_value = bool_value_;
     return true;
   }
   return is_bool();
@@ skipping 13 matching lines @@
     return true;
   } else if (out_value && is_int()) {
     // Allow promotion from int to double.
     *out_value = int_value_;
     return true;
   }
   return is_double() || is_int();
 }
 
 bool Value::GetAsString(std::string* out_value) const {
-  return false;
+  if (out_value && is_string()) {
+    *out_value = *string_value_;
+    return true;
+  }
+  return is_string();
 }
 
 bool Value::GetAsString(string16* out_value) const {
-  return false;
+  if (out_value && is_string()) {
+    *out_value = UTF8ToUTF16(*string_value_);
+    return true;
+  }
+  return is_string();
 }
 
 bool Value::GetAsString(const StringValue** out_value) const {
-  return false;
+  if (out_value && is_string()) {
+    *out_value = static_cast<const StringValue*>(this);
+    return true;
+  }
+  return is_string();
 }
 
 bool Value::GetAsList(ListValue** out_value) {
   return false;
 }
 
 bool Value::GetAsList(const ListValue** out_value) const {
   return false;
 }
 
@@ skipping 13 matching lines @@
       return CreateNullValue().release();
 
     // For now, make FundamentalValues for backward-compatibility. Convert to
     // Value when that code is deleted.
     case TYPE_BOOLEAN:
       return new FundamentalValue(bool_value_);
     case TYPE_INTEGER:
       return new FundamentalValue(int_value_);
     case TYPE_DOUBLE:
       return new FundamentalValue(double_value_);
+    // For now, make StringValues for backward-compatibility. Convert to
+    // Value when that code is deleted.
+    case TYPE_STRING:
+      return new StringValue(*string_value_);
 
     default:
       // All other types should be handled by subclasses.
       NOTREACHED();
       return nullptr;
   }
 }
 
 std::unique_ptr<Value> Value::CreateDeepCopy() const {
   return WrapUnique(DeepCopy());
 }
 
 bool Value::Equals(const Value* other) const {
   if (other->type() != type())
     return false;
 
   switch (type()) {
     case TYPE_NULL:
       return true;
     case TYPE_BOOLEAN:
       return bool_value_ == other->bool_value_;
     case TYPE_INTEGER:
       return int_value_ == other->int_value_;
     case TYPE_DOUBLE:
       return double_value_ == other->double_value_;
+    // TODO(jdoerrie): Simplify this once JSONStringValue is migrated.
+    case TYPE_STRING: {
+      std::string lhs, rhs;
+      return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
+    }
     default:
       // This method should only be getting called for the above types -- all
       // subclasses need to provide their own implementation;.
       NOTREACHED();
       return false;
   }
 }
 
 // static
 bool Value::Equals(const Value* a, const Value* b) {
@@ skipping 23 matching lines @@
 
 FundamentalValue::FundamentalValue(double in_value)
     : Value(in_value) {
 }
 
 FundamentalValue::~FundamentalValue() {
 }
 
 ///////////////////// StringValue ////////////////////
 
-StringValue::StringValue(StringPiece in_value)
-    : Value(TYPE_STRING), value_(in_value.as_string()) {
-  DCHECK(IsStringUTF8(in_value));
-}
+StringValue::StringValue(StringPiece in_value) : Value(in_value) {}
 
-StringValue::StringValue(const string16& in_value)
-    : Value(TYPE_STRING),
-      value_(UTF16ToUTF8(in_value)) {
-}
+StringValue::StringValue(const string16& in_value) : Value(in_value) {}
 
 StringValue::~StringValue() {
 }

[vabr (Chromium), 2016/12/07 10:17:27]

Should this (or ~Value) run string_value_.Destroy()?

[jdoerrie, 2016/12/08 09:59:34]

Done. Implemented it as part of InternalCleanup. Currently we have to hack
around JSONStringValue unfortunately.

 
-std::string* StringValue::GetString() {
-  return &value_;
-}
-
-const std::string& StringValue::GetString() const {
-  return value_;
-}
-
-bool StringValue::GetAsString(std::string* out_value) const {
-  if (out_value)
-    *out_value = value_;
-  return true;
-}
-
-bool StringValue::GetAsString(string16* out_value) const {
-  if (out_value)
-    *out_value = UTF8ToUTF16(value_);
-  return true;
-}
-
-bool StringValue::GetAsString(const StringValue** out_value) const {
-  if (out_value)
-    *out_value = this;
-  return true;
-}
-
-StringValue* StringValue::DeepCopy() const {
-  return new StringValue(value_);
-}
-
-bool StringValue::Equals(const Value* other) const {
-  if (other->GetType() != GetType())
-    return false;
-  std::string lhs, rhs;
-  return GetAsString(&lhs) && other->GetAsString(&rhs) && lhs == rhs;
-}
-
 ///////////////////// BinaryValue ////////////////////
 
 BinaryValue::BinaryValue()
     : Value(TYPE_BINARY),
       size_(0) {
 }
 
 BinaryValue::BinaryValue(std::unique_ptr<char[]> buffer, size_t size)
     : Value(TYPE_BINARY), buffer_(std::move(buffer)), size_(size) {}
 
@@ skipping 853 matching lines @@
 ValueDeserializer::~ValueDeserializer() {
 }
 
 std::ostream& operator<<(std::ostream& out, const Value& value) {
   std::string json;
   JSONWriter::WriteWithOptions(value, JSONWriter::OPTIONS_PRETTY_PRINT, &json);
   return out << json;
 }
 
 }  // namespace base