| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef V8_JSON_STRINGIFIER_H_ | 5 #ifndef V8_JSON_STRINGIFIER_H_ |
| 6 #define V8_JSON_STRINGIFIER_H_ | 6 #define V8_JSON_STRINGIFIER_H_ |
| 7 | 7 |
| 8 #include "src/v8.h" | 8 #include "src/v8.h" |
| 9 | 9 |
| 10 #include "src/conversions.h" | 10 #include "src/conversions.h" |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 Handle<Map> map(object->map()); | 645 Handle<Map> map(object->map()); |
| 646 for (int i = 0; i < map->NumberOfOwnDescriptors(); i++) { | 646 for (int i = 0; i < map->NumberOfOwnDescriptors(); i++) { |
| 647 Handle<Name> name(map->instance_descriptors()->GetKey(i), isolate_); | 647 Handle<Name> name(map->instance_descriptors()->GetKey(i), isolate_); |
| 648 // TODO(rossberg): Should this throw? | 648 // TODO(rossberg): Should this throw? |
| 649 if (!name->IsString()) continue; | 649 if (!name->IsString()) continue; |
| 650 Handle<String> key = Handle<String>::cast(name); | 650 Handle<String> key = Handle<String>::cast(name); |
| 651 PropertyDetails details = map->instance_descriptors()->GetDetails(i); | 651 PropertyDetails details = map->instance_descriptors()->GetDetails(i); |
| 652 if (details.IsDontEnum()) continue; | 652 if (details.IsDontEnum()) continue; |
| 653 Handle<Object> property; | 653 Handle<Object> property; |
| 654 if (details.type() == FIELD && *map == object->map()) { | 654 if (details.type() == FIELD && *map == object->map()) { |
| 655 FieldIndex field_index = FieldIndex::ForDescriptor(*map, i); | 655 property = Handle<Object>(object->RawFastPropertyAt( |
| 656 Isolate* isolate = object->GetIsolate(); | 656 FieldIndex::ForDescriptor(*map, i)), isolate_); |
| 657 if (object->IsUnboxedDoubleField(field_index)) { | |
| 658 double value = object->RawFastDoublePropertyAt(field_index); | |
| 659 property = isolate->factory()->NewHeapNumber(value); | |
| 660 | |
| 661 } else { | |
| 662 property = handle(object->RawFastPropertyAt(field_index), isolate); | |
| 663 } | |
| 664 } else { | 657 } else { |
| 665 ASSIGN_RETURN_ON_EXCEPTION_VALUE( | 658 ASSIGN_RETURN_ON_EXCEPTION_VALUE( |
| 666 isolate_, property, | 659 isolate_, property, |
| 667 Object::GetPropertyOrElement(object, key), | 660 Object::GetPropertyOrElement(object, key), |
| 668 EXCEPTION); | 661 EXCEPTION); |
| 669 } | 662 } |
| 670 Result result = SerializeProperty(property, comma, key); | 663 Result result = SerializeProperty(property, comma, key); |
| 671 if (!comma && result == SUCCESS) comma = true; | 664 if (!comma && result == SUCCESS) comma = true; |
| 672 if (result == EXCEPTION) return result; | 665 if (result == EXCEPTION) return result; |
| 673 } | 666 } |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 SerializeString_<false, uint8_t>(object); | 870 SerializeString_<false, uint8_t>(object); |
| 878 } else { | 871 } else { |
| 879 SerializeString_<false, uc16>(object); | 872 SerializeString_<false, uc16>(object); |
| 880 } | 873 } |
| 881 } | 874 } |
| 882 } | 875 } |
| 883 | 876 |
| 884 } } // namespace v8::internal | 877 } } // namespace v8::internal |
| 885 | 878 |
| 886 #endif // V8_JSON_STRINGIFIER_H_ | 879 #endif // V8_JSON_STRINGIFIER_H_ |
| OLD | NEW |