| Index: third_party/WebKit/Source/platform/TracedValue.cpp
|
| diff --git a/third_party/WebKit/Source/platform/TracedValue.cpp b/third_party/WebKit/Source/platform/TracedValue.cpp
|
| index 96e4010eea705c80a66227f83369063a9e257dbc..f35dfc7b0996223f8a2403bdf4ae05bcbc4a6612 100644
|
| --- a/third_party/WebKit/Source/platform/TracedValue.cpp
|
| +++ b/third_party/WebKit/Source/platform/TracedValue.cpp
|
| @@ -166,9 +166,9 @@ private:
|
| Vector<String> m_order;
|
| };
|
|
|
| -PassRefPtr<TracedValue> TracedValue::create()
|
| +scoped_refptr<TracedValue> TracedValue::create()
|
| {
|
| - return adoptRef(new TracedValue());
|
| + return new TracedValue();
|
| }
|
|
|
| TracedValue::TracedValue()
|
| @@ -263,12 +263,12 @@ void TracedValue::endArray()
|
| m_stack.removeLast();
|
| }
|
|
|
| -String TracedValue::asTraceFormat() const
|
| +void TracedValue::AppendAsTraceFormat(std::string* out) const
|
| {
|
| ASSERT(m_stack.size() == 1);
|
| StringBuilder builder;
|
| m_stack.first()->toJSON(&builder);
|
| - return builder.toString();
|
| + *out = builder.toString().utf8().data();
|
| }
|
|
|
| TracedDictionaryValue* TracedValue::currentDictionary() const
|
|
|