summaryrefslogtreecommitdiffstats
path: root/chrome/common/serialized_script_value.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/serialized_script_value.cc')
-rw-r--r--chrome/common/serialized_script_value.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/common/serialized_script_value.cc b/chrome/common/serialized_script_value.cc
index 095f4e6..deff44c 100644
--- a/chrome/common/serialized_script_value.cc
+++ b/chrome/common/serialized_script_value.cc
@@ -4,6 +4,7 @@
#include "chrome/common/serialized_script_value.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
using WebKit::WebSerializedScriptValue;
@@ -21,11 +22,8 @@ SerializedScriptValue::SerializedScriptValue(
}
SerializedScriptValue::SerializedScriptValue(
- const WebSerializedScriptValue& value)
- : is_null_(value.isNull()),
- is_invalid_(value.isNull() ? false : value.toString().isNull()),
- data_(value.isNull() ? string16()
- : static_cast<string16>(value.toString())) {
+ const WebSerializedScriptValue& value) {
+ set_web_serialized_script_value(value);
}
SerializedScriptValue::operator WebSerializedScriptValue() const {
@@ -35,3 +33,10 @@ SerializedScriptValue::operator WebSerializedScriptValue() const {
return WebSerializedScriptValue::createInvalid();
return WebSerializedScriptValue::fromString(data_);
}
+
+void SerializedScriptValue::set_web_serialized_script_value(
+ const WebSerializedScriptValue& value) {
+ is_null_ = value.isNull();
+ is_invalid_ = value.isNull() ? false : value.toString().isNull();
+ data_ = value.isNull() ? string16() : static_cast<string16>(value.toString());
+}