From cbd3a1cb77f7cb969223bb61edcbd65352f81426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 20 Sep 2019 10:23:48 +0200 Subject: [PATCH] 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 Reviewed-By: Colin Ihrig --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/inspector/custom-preview.cc | 2 +- deps/v8/src/inspector/custom-preview.h | 6 +++--- deps/v8/src/inspector/injected-script.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index adac5911c86284..0406f65b08e684 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 7 #define V8_MINOR_VERSION 7 #define V8_BUILD_NUMBER 299 -#define V8_PATCH_LEVEL 10 +#define V8_PATCH_LEVEL 11 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/inspector/custom-preview.cc b/deps/v8/src/inspector/custom-preview.cc index f56562341cae7a..77cd6dc5f56077 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& info) { } // anonymous namespace void generateCustomPreview(int sessionId, const String16& groupName, - v8::Local context, v8::Local object, v8::MaybeLocal maybeConfig, int maxDepth, std::unique_ptr* preview) { + v8::Local 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 1ae8e25a4c7af3..1e8c74a154c499 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 context, - v8::Local object, v8::MaybeLocal config, - int maxDepth, std::unique_ptr* preview); + int sessionId, const String16& groupName, v8::Local object, + v8::MaybeLocal config, int maxDepth, + std::unique_ptr* preview); } // namespace v8_inspector diff --git a/deps/v8/src/inspector/injected-script.cc b/deps/v8/src/inspector/injected-script.cc index 1edd559e4ef75c..ad91a8e65e97aa 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 customPreview; - generateCustomPreview(sessionId, groupName, context, value.As(), + generateCustomPreview(sessionId, groupName, value.As(), customPreviewConfig, maxCustomPreviewDepth, &customPreview); if (customPreview) (*result)->setCustomPreview(std::move(customPreview));