Merged r14224 into trunk branch.

src/json-stringifier.h

 // Copyright 2012 the V8 project authors. 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
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 277 matching lines @@
   static const int kJsonQuoteWorstCaseBlowup = 6;
   static const int kSpaceForQuotes = 2;
   int worst_case_length =
       object->length() * kJsonQuoteWorstCaseBlowup + kSpaceForQuotes;
 
   if (worst_case_length > 32 * KB) {  // Slow path if too large.
     BasicJsonStringifier stringifier(isolate);
     return stringifier.Stringify(object);
   }
 
-  object = FlattenGetString(object);
+  FlattenString(object);
   ASSERT(object->IsFlat());
-  if (object->IsOneByteRepresentation()) {
+  if (object->IsOneByteRepresentationUnderneath()) {
     Handle<String> result =
         isolate->factory()->NewRawOneByteString(worst_case_length);
     AssertNoAllocation no_alloc;
-    const uint8_t* start = object->IsSeqOneByteString()
-        ? SeqOneByteString::cast(*object)->GetChars()
-        : ExternalAsciiString::cast(*object)->GetChars();
     return StringifyString_<SeqOneByteString>(
         isolate,
-        Vector<const uint8_t>(start, object->length()),
+        object->GetFlatContent().ToOneByteVector(),
         result);
   } else {
     Handle<String> result =
         isolate->factory()->NewRawTwoByteString(worst_case_length);
     AssertNoAllocation no_alloc;
-    const uc16* start = object->IsSeqTwoByteString()
-        ? SeqTwoByteString::cast(*object)->GetChars()
-        : ExternalTwoByteString::cast(*object)->GetChars();
     return StringifyString_<SeqTwoByteString>(
         isolate,
-        Vector<const uc16>(start, object->length()),
+        object->GetFlatContent().ToUC16Vector(),
         result);
   }
 }
 
 
 template <typename ResultType, typename Char>
 MaybeObject* BasicJsonStringifier::StringifyString_(Isolate* isolate,
                                                     Vector<Char> vector,
                                                     Handle<String> result) {
   AssertNoAllocation no_allocation;
@@ skipping 514 matching lines @@
       SerializeString_<false, uint8_t>(object);
     } else {
       SerializeString_<false, uc16>(object);
     }
   }
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_JSON_STRINGIFIER_H_