Commit dd3e68b8 authored by Hitoshi Yoshida's avatar Hitoshi Yoshida Committed by Commit Bot

bindings: Define ToV8(ScriptPromise)

Bug: 839389
Change-Id: I7ceb70571b1ee8b6219707f51b642187894ae51e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2054623Reviewed-by: default avatarYuki Shiino <yukishiino@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Hitoshi Yoshida <peria@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741349}
parent b3ac523f
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// handle. Call sites must check IsEmpty() before using return value. // handle. Call sites must check IsEmpty() before using return value.
#include "third_party/blink/renderer/bindings/core/v8/idl_dictionary_base.h" #include "third_party/blink/renderer/bindings/core/v8/idl_dictionary_base.h"
#include "third_party/blink/renderer/bindings/core/v8/script_promise.h"
#include "third_party/blink/renderer/bindings/core/v8/script_value.h" #include "third_party/blink/renderer/bindings/core/v8/script_value.h"
#include "third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h" #include "third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h"
#include "third_party/blink/renderer/platform/bindings/to_v8.h" #include "third_party/blink/renderer/platform/bindings/to_v8.h"
...@@ -50,6 +51,15 @@ inline v8::Local<v8::Value> ToV8(const IDLDictionaryBase* value, ...@@ -50,6 +51,15 @@ inline v8::Local<v8::Value> ToV8(const IDLDictionaryBase* value,
return value->ToV8Impl(creation_context, isolate); return value->ToV8Impl(creation_context, isolate);
} }
// Promise
inline v8::Local<v8::Value> ToV8(const ScriptPromise& value,
v8::Local<v8::Object> creation_context,
v8::Isolate* isolate) {
DCHECK(!value.IsEmpty());
return value.V8Value();
}
// ScriptValue // ScriptValue
inline v8::Local<v8::Value> ToV8(const ScriptValue& value, inline v8::Local<v8::Value> ToV8(const ScriptValue& value,
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.h" #include "third_party/blink/renderer/core/timing/measure_memory/measure_memory_delegate.h"
#include "third_party/blink/public/platform/platform.h" #include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/renderer/bindings/core/v8/to_v8_for_core.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_measure_memory.h" #include "third_party/blink/renderer/bindings/core/v8/v8_measure_memory.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_measure_memory_breakdown.h" #include "third_party/blink/renderer/bindings/core/v8/v8_measure_memory_breakdown.h"
#include "third_party/blink/renderer/core/execution_context/execution_context.h" #include "third_party/blink/renderer/core/execution_context/execution_context.h"
...@@ -152,8 +153,7 @@ void MeasureMemoryDelegate::MeasurementComplete( ...@@ -152,8 +153,7 @@ void MeasureMemoryDelegate::MeasurementComplete(
result->setBreakdown(breakdown); result->setBreakdown(breakdown);
v8::Local<v8::Promise::Resolver> promise_resolver = v8::Local<v8::Promise::Resolver> promise_resolver =
promise_resolver_.NewLocal(isolate_); promise_resolver_.NewLocal(isolate_);
promise_resolver promise_resolver->Resolve(context, ToV8(result, promise_resolver, isolate_))
->Resolve(context, result->ToV8Impl(promise_resolver, isolate_))
.ToChecked(); .ToChecked();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment