From b7338b700fdc7927763840927c8acaf4963c0587 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 15 Mar 2019 22:59:28 +0100 Subject: [PATCH] deps: V8: cherry-pick f0bb5d2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [api] remove LegacyBuildEmbedderGraphCallback This should not be used anymore (and it definitely is not by Node.js or Chromium). Change-Id: I4a1ce1fda98efd197a64ce0969dae5c8b18f6e97 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1511484 Reviewed-by: Yang Guo Commit-Queue: Yang Guo Cr-Commit-Position: refs/heads/master@{#60139} Refs: https://github.com/v8/v8/commit/f0bb5d2fcf52cdc4147b0f17ab19f3d10d585f14 PR-URL: https://github.com/nodejs/node/pull/26685 Reviewed-By: Anna Henningsen Reviewed-By: Michaël Zasso Reviewed-By: Refael Ackermann --- common.gypi | 2 +- deps/v8/include/v8-profiler.h | 8 -------- deps/v8/src/api.cc | 10 ---------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/common.gypi b/common.gypi index 23fe6b6e2ffbea..3d2584a3fa5bf6 100644 --- a/common.gypi +++ b/common.gypi @@ -37,7 +37,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.4', + 'v8_embedder_string': '-node.5', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8-profiler.h b/deps/v8/include/v8-profiler.h index 3adce79be5683c..ada2dbbe5c1c04 100644 --- a/deps/v8/include/v8-profiler.h +++ b/deps/v8/include/v8-profiler.h @@ -756,10 +756,6 @@ class V8_EXPORT HeapProfiler { v8::EmbedderGraph* graph, void* data); - /** TODO(addaleax): Remove */ - typedef void (*LegacyBuildEmbedderGraphCallback)(v8::Isolate* isolate, - v8::EmbedderGraph* graph); - /** Returns the number of snapshots taken. */ int GetSnapshotCount(); @@ -898,10 +894,6 @@ class V8_EXPORT HeapProfiler { */ void DeleteAllHeapSnapshots(); - V8_DEPRECATED( - "Use AddBuildEmbedderGraphCallback to provide info about embedder nodes", - void SetBuildEmbedderGraphCallback( - LegacyBuildEmbedderGraphCallback callback)); void AddBuildEmbedderGraphCallback(BuildEmbedderGraphCallback callback, void* data); void RemoveBuildEmbedderGraphCallback(BuildEmbedderGraphCallback callback, diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 716db0c85d7492..657c93419c7c6c 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -10443,16 +10443,6 @@ void HeapProfiler::DeleteAllHeapSnapshots() { reinterpret_cast(this)->DeleteAllSnapshots(); } -void HeapProfiler::SetBuildEmbedderGraphCallback( - LegacyBuildEmbedderGraphCallback callback) { - reinterpret_cast(this)->AddBuildEmbedderGraphCallback( - [](v8::Isolate* isolate, v8::EmbedderGraph* graph, void* data) { - reinterpret_cast(data)(isolate, - graph); - }, - reinterpret_cast(callback)); -} - void HeapProfiler::AddBuildEmbedderGraphCallback( BuildEmbedderGraphCallback callback, void* data) { reinterpret_cast(this)->AddBuildEmbedderGraphCallback(