Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: src/json-stringifier.h

Issue 23480051: Correctly stringify mixed encoding indirect strings. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/cctest/test-strings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 Vector<const uc16> BasicJsonStringifier::GetCharVector(Handle<String> string) { 828 Vector<const uc16> BasicJsonStringifier::GetCharVector(Handle<String> string) {
829 String::FlatContent flat = string->GetFlatContent(); 829 String::FlatContent flat = string->GetFlatContent();
830 ASSERT(flat.IsTwoByte()); 830 ASSERT(flat.IsTwoByte());
831 return flat.ToUC16Vector(); 831 return flat.ToUC16Vector();
832 } 832 }
833 833
834 834
835 void BasicJsonStringifier::SerializeString(Handle<String> object) { 835 void BasicJsonStringifier::SerializeString(Handle<String> object) {
836 object = FlattenGetString(object); 836 object = FlattenGetString(object);
837 if (is_ascii_) { 837 if (is_ascii_) {
838 if (object->IsOneByteRepresentation()) { 838 if (object->IsOneByteRepresentationUnderneath()) {
839 SerializeString_<true, uint8_t>(object); 839 SerializeString_<true, uint8_t>(object);
840 } else { 840 } else {
841 ChangeEncoding(); 841 ChangeEncoding();
842 SerializeString(object); 842 SerializeString(object);
843 } 843 }
844 } else { 844 } else {
845 if (object->IsOneByteRepresentation()) { 845 if (object->IsOneByteRepresentationUnderneath()) {
846 SerializeString_<false, uint8_t>(object); 846 SerializeString_<false, uint8_t>(object);
847 } else { 847 } else {
848 SerializeString_<false, uc16>(object); 848 SerializeString_<false, uc16>(object);
849 } 849 }
850 } 850 }
851 } 851 }
852 852
853 } } // namespace v8::internal 853 } } // namespace v8::internal
854 854
855 #endif // V8_JSON_STRINGIFIER_H_ 855 #endif // V8_JSON_STRINGIFIER_H_
OLDNEW
« no previous file with comments | « no previous file | test/cctest/test-strings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698