diff options
| author | Michaël Zasso <targos@protonmail.com> | 2019-09-20 10:23:48 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2019-09-23 15:25:22 +0200 |
| commit | cbd3a1cb77f7cb969223bb61edcbd65352f81426 (patch) | |
| tree | 5a9aebfc7c3283f9f084b82482695e2210f4ee83 /deps/v8/src | |
| parent | fdd5d4ad4a228af6e5a7dc74ddf0e03dc5637254 (diff) | |
| download | android-node-v8-cbd3a1cb77f7cb969223bb61edcbd65352f81426.tar.gz android-node-v8-cbd3a1cb77f7cb969223bb61edcbd65352f81426.tar.bz2 android-node-v8-cbd3a1cb77f7cb969223bb61edcbd65352f81426.zip | |
deps: patch V8 to 7.7.299.11
Refs: https://github.com/v8/v8/compare/7.7.299.10...7.7.299.11
PR-URL: https://github.com/nodejs/node/pull/29628
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/src')
| -rw-r--r-- | deps/v8/src/inspector/custom-preview.cc | 2 | ||||
| -rw-r--r-- | deps/v8/src/inspector/custom-preview.h | 6 | ||||
| -rw-r--r-- | deps/v8/src/inspector/injected-script.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/deps/v8/src/inspector/custom-preview.cc b/deps/v8/src/inspector/custom-preview.cc index f56562341c..77cd6dc5f5 100644 --- a/deps/v8/src/inspector/custom-preview.cc +++ b/deps/v8/src/inspector/custom-preview.cc @@ -242,10 +242,10 @@ void bodyCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { } // anonymous namespace void generateCustomPreview(int sessionId, const String16& groupName, - v8::Local<v8::Context> context, v8::Local<v8::Object> object, v8::MaybeLocal<v8::Value> maybeConfig, int maxDepth, std::unique_ptr<CustomPreview>* preview) { + v8::Local<v8::Context> context = object->CreationContext(); v8::Isolate* isolate = context->GetIsolate(); v8::MicrotasksScope microtasksScope(isolate, v8::MicrotasksScope::kDoNotRunMicrotasks); diff --git a/deps/v8/src/inspector/custom-preview.h b/deps/v8/src/inspector/custom-preview.h index 1ae8e25a4c..1e8c74a154 100644 --- a/deps/v8/src/inspector/custom-preview.h +++ b/deps/v8/src/inspector/custom-preview.h @@ -13,9 +13,9 @@ namespace v8_inspector { const int kMaxCustomPreviewDepth = 20; void generateCustomPreview( - int sessionId, const String16& groupName, v8::Local<v8::Context> context, - v8::Local<v8::Object> object, v8::MaybeLocal<v8::Value> config, - int maxDepth, std::unique_ptr<protocol::Runtime::CustomPreview>* preview); + int sessionId, const String16& groupName, v8::Local<v8::Object> object, + v8::MaybeLocal<v8::Value> config, int maxDepth, + std::unique_ptr<protocol::Runtime::CustomPreview>* preview); } // namespace v8_inspector diff --git a/deps/v8/src/inspector/injected-script.cc b/deps/v8/src/inspector/injected-script.cc index 1edd559e4e..ad91a8e65e 100644 --- a/deps/v8/src/inspector/injected-script.cc +++ b/deps/v8/src/inspector/injected-script.cc @@ -458,7 +458,7 @@ Response InjectedScript::wrapObjectMirror( if (!response.isSuccess()) return response; if (customPreviewEnabled && value->IsObject()) { std::unique_ptr<protocol::Runtime::CustomPreview> customPreview; - generateCustomPreview(sessionId, groupName, context, value.As<v8::Object>(), + generateCustomPreview(sessionId, groupName, value.As<v8::Object>(), customPreviewConfig, maxCustomPreviewDepth, &customPreview); if (customPreview) (*result)->setCustomPreview(std::move(customPreview)); |