Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 26 insertions, 3 deletions

diff --git a/WebCore/inspector/InspectorValues.cpp b/WebCore/inspector/InspectorValues.cpp
index c96e953..89e9b7c 100644
--- a/WebCore/inspector/InspectorValues.cpp
+++ b/WebCore/inspector/InspectorValues.cpp
@@ -33,6 +33,8 @@
 
 #if ENABLE(INSPECTOR)
 
+#include <wtf/DecimalNumber.h>
+
 namespace WebCore {
 
 namespace {
@@ -604,9 +606,9 @@ void InspectorBasicValue::writeJSON(Vector<UChar>* output) const
         else
             output->append(falseString, 5);
     } else if (type() == TypeNumber) {
-        String value = String::format("%f", m_doubleValue);
-        value.replace(',', '.');
-        output->append(value.characters(), value.length());
+        NumberToStringBuffer buffer;
+        unsigned length = DecimalNumber(m_doubleValue).toStringDecimal(buffer, WTF::NumberToStringBufferLength);
+        output->append(buffer, length);
     }
 }
 
@@ -622,6 +624,10 @@ void InspectorString::writeJSON(Vector<UChar>* output) const
     doubleQuoteString(m_stringValue, output);
 }
 
+InspectorObject::~InspectorObject()
+{
+}
+
 bool InspectorObject::asObject(RefPtr<InspectorObject>* output)
 {
     *output = this;
@@ -696,6 +702,17 @@ void InspectorObject::writeJSON(Vector<UChar>* output) const
     output->append('}');
 }
 
+InspectorObject::InspectorObject()
+    : InspectorValue(TypeObject)
+    , m_data()
+    , m_order()
+{
+}
+
+InspectorArray::~InspectorArray()
+{
+}
+
 bool InspectorArray::asArray(RefPtr<InspectorArray>* output)
 {
     *output = this;
@@ -718,6 +735,12 @@ void InspectorArray::writeJSON(Vector<UChar>* output) const
     output->append(']');
 }
 
+InspectorArray::InspectorArray()
+    : InspectorValue(TypeArray)
+    , m_data()
+{
+}
+
 PassRefPtr<InspectorValue> InspectorArray::get(size_t index)
 {
     ASSERT(index < m_data.size());