diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/v8/src/json-stringifier.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/json-stringifier.cc')
| -rw-r--r-- | chromium/v8/src/json-stringifier.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/v8/src/json-stringifier.cc b/chromium/v8/src/json-stringifier.cc index f31aedd9a94..5cbc4191503 100644 --- a/chromium/v8/src/json-stringifier.cc +++ b/chromium/v8/src/json-stringifier.cc @@ -216,7 +216,7 @@ MaybeHandle<Object> JsonStringifier::ApplyReplacerFunction( Handle<JSReceiver> JsonStringifier::CurrentHolder( Handle<Object> value, Handle<Object> initial_holder) { - int length = Smi::cast(stack_->length())->value(); + int length = Smi::ToInt(stack_->length()); if (length == 0) { Handle<JSObject> holder = factory()->NewJSObject(isolate_->object_function()); @@ -237,7 +237,7 @@ JsonStringifier::Result JsonStringifier::StackPush(Handle<Object> object) { return EXCEPTION; } - int length = Smi::cast(stack_->length())->value(); + int length = Smi::ToInt(stack_->length()); { DisallowHeapAllocation no_allocation; FixedArray* elements = FixedArray::cast(stack_->elements()); @@ -257,7 +257,7 @@ JsonStringifier::Result JsonStringifier::StackPush(Handle<Object> object) { } void JsonStringifier::StackPop() { - int length = Smi::cast(stack_->length())->value(); + int length = Smi::ToInt(stack_->length()); stack_->set_length(Smi::FromInt(length - 1)); } @@ -334,7 +334,6 @@ JsonStringifier::Result JsonStringifier::Serialize_(Handle<Object> object, } UNREACHABLE(); - return UNCHANGED; } JsonStringifier::Result JsonStringifier::SerializeJSValue( @@ -395,7 +394,7 @@ JsonStringifier::Result JsonStringifier::SerializeJSArray( uint32_t i = 0; if (replacer_function_.is_null()) { switch (object->GetElementsKind()) { - case FAST_SMI_ELEMENTS: { + case PACKED_SMI_ELEMENTS: { Handle<FixedArray> elements(FixedArray::cast(object->elements()), isolate_); StackLimitCheck interrupt_check(isolate_); @@ -411,7 +410,7 @@ JsonStringifier::Result JsonStringifier::SerializeJSArray( } break; } - case FAST_DOUBLE_ELEMENTS: { + case PACKED_DOUBLE_ELEMENTS: { // Empty array is FixedArray but not FixedDoubleArray. if (length == 0) break; Handle<FixedDoubleArray> elements( @@ -429,11 +428,11 @@ JsonStringifier::Result JsonStringifier::SerializeJSArray( } break; } - case FAST_ELEMENTS: { + case PACKED_ELEMENTS: { Handle<Object> old_length(object->length(), isolate_); while (i < length) { if (object->length() != *old_length || - object->GetElementsKind() != FAST_ELEMENTS) { + object->GetElementsKind() != PACKED_ELEMENTS) { // Fall back to slow path. break; } |