Merge 88444

Source/WebCore/inspector/InspectorValues.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 602 matching lines @@
 void InspectorBasicValue::writeJSON(Vector<UChar>* output) const
 {
     ASSERT(type() == TypeBoolean || type() == TypeNumber);
     if (type() == TypeBoolean) {
         if (m_boolValue)
             output->append(trueString, 4);
         else
             output->append(falseString, 5);
     } else if (type() == TypeNumber) {
         NumberToStringBuffer buffer;
-        unsigned length = DecimalNumber(m_doubleValue).toStringDecimal(buffer, WTF::NumberToStringBufferLength);
+        DecimalNumber decimal = m_doubleValue;
+        unsigned length = 0;
+        if (decimal.bufferLengthForStringDecimal() > WTF::NumberToStringBufferLength) {
+            // Not enough room for decimal. Use exponential format.
+            if (decimal.bufferLengthForStringExponential() > WTF::NumberToStringBufferLength) {
+                // Fallback for an abnormal case if it's too little even for exponential.
+                output->append("NaN", 3);
+                return;
+            }
+            length = decimal.toStringExponential(buffer, WTF::NumberToStringBufferLength);
+        } else
+            length = decimal.toStringDecimal(buffer, WTF::NumberToStringBufferLength);
         output->append(buffer, length);
     }
 }
 
 bool InspectorString::asString(String* output) const
 {
     *output = m_stringValue;
     return true;
 }
 
@@ skipping 125 matching lines @@
 
 PassRefPtr<InspectorValue> InspectorArray::get(size_t index)
 {
     ASSERT(index < m_data.size());
     return m_data[index];
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)