Chromium Code Reviews| Index: src/builtins.cc |
| diff --git a/src/builtins.cc b/src/builtins.cc |
| index 6b6c4acd09dfb1b5217bcab016c99724321a3c6f..8d5f74de0bd731ace07307b85ada457df907da9a 100644 |
| --- a/src/builtins.cc |
| +++ b/src/builtins.cc |
| @@ -1588,7 +1588,7 @@ BUILTIN(ObjectAssign) { |
| // 4b ii. Let keys be ? from.[[OwnPropertyKeys]](). |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| - isolate, keys, JSReceiver::GetKeys(from, JSReceiver::OWN_ONLY, |
| + isolate, keys, JSReceiver::GetKeys(from, KeyCollectionType::OWN_ONLY, |
|
Jakob Kummerow
2016/02/04 15:37:27
nit: Why don't you s/KeyCollectionType::// here an
Camillo Bruni
2016/02/04 17:14:32
uh right :)
|
| ALL_PROPERTIES, KEEP_NUMBERS)); |
| // 4c. Repeat for each element nextKey of keys in List order, |
| for (int j = 0; j < keys->length(); ++j) { |
| @@ -1676,8 +1676,8 @@ Object* GetOwnPropertyKeys(Isolate* isolate, |
| Object::ToObject(isolate, object)); |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| - isolate, keys, JSReceiver::GetKeys(receiver, JSReceiver::OWN_ONLY, filter, |
| - CONVERT_TO_STRING)); |
| + isolate, keys, JSReceiver::GetKeys(receiver, KeyCollectionType::OWN_ONLY, |
| + filter, CONVERT_TO_STRING)); |
| return *isolate->factory()->NewJSArrayWithElements(keys); |
| } |
| @@ -1745,8 +1745,8 @@ BUILTIN(ObjectKeys) { |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| isolate, keys, |
| - JSReceiver::GetKeys(receiver, JSReceiver::OWN_ONLY, ENUMERABLE_STRINGS, |
| - CONVERT_TO_STRING)); |
| + JSReceiver::GetKeys(receiver, KeyCollectionType::OWN_ONLY, |
| + ENUMERABLE_STRINGS, CONVERT_TO_STRING)); |
| return *isolate->factory()->NewJSArrayWithElements(keys); |
| } |
| @@ -1760,8 +1760,8 @@ BUILTIN(ObjectValues) { |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| isolate, keys, |
| - JSReceiver::GetKeys(receiver, JSReceiver::OWN_ONLY, ENUMERABLE_STRINGS, |
| - CONVERT_TO_STRING)); |
| + JSReceiver::GetKeys(receiver, KeyCollectionType::OWN_ONLY, |
| + ENUMERABLE_STRINGS, CONVERT_TO_STRING)); |
| for (int i = 0; i < keys->length(); ++i) { |
| auto key = Handle<Name>::cast(FixedArray::get(*keys, i, isolate)); |
| @@ -1786,8 +1786,8 @@ BUILTIN(ObjectEntries) { |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| isolate, keys, |
| - JSReceiver::GetKeys(receiver, JSReceiver::OWN_ONLY, ENUMERABLE_STRINGS, |
| - CONVERT_TO_STRING)); |
| + JSReceiver::GetKeys(receiver, KeyCollectionType::OWN_ONLY, |
| + ENUMERABLE_STRINGS, CONVERT_TO_STRING)); |
| for (int i = 0; i < keys->length(); ++i) { |
| auto key = Handle<Name>::cast(FixedArray::get(*keys, i, isolate)); |
| @@ -2091,8 +2091,8 @@ BUILTIN(ReflectOwnKeys) { |
| Handle<FixedArray> keys; |
| ASSIGN_RETURN_FAILURE_ON_EXCEPTION( |
| isolate, keys, JSReceiver::GetKeys(Handle<JSReceiver>::cast(target), |
| - JSReceiver::OWN_ONLY, ALL_PROPERTIES, |
| - CONVERT_TO_STRING)); |
| + KeyCollectionType::OWN_ONLY, |
| + ALL_PROPERTIES, CONVERT_TO_STRING)); |
| return *isolate->factory()->NewJSArrayWithElements(keys); |
| } |