Skip to content

Commit

Permalink
deps: V8: cherry-pick f0bb5d2
Browse files Browse the repository at this point in the history
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 <yangguo@chromium.org>
    Commit-Queue: Yang Guo <yangguo@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#60139}

Refs: v8/v8@f0bb5d2

PR-URL: nodejs#26685
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information
addaleax authored and refack committed Mar 28, 2019
1 parent 0217194 commit b7338b7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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 #####

Expand Down
8 changes: 0 additions & 8 deletions deps/v8/include/v8-profiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions deps/v8/src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10443,16 +10443,6 @@ void HeapProfiler::DeleteAllHeapSnapshots() {
reinterpret_cast<i::HeapProfiler*>(this)->DeleteAllSnapshots();
}

void HeapProfiler::SetBuildEmbedderGraphCallback(
LegacyBuildEmbedderGraphCallback callback) {
reinterpret_cast<i::HeapProfiler*>(this)->AddBuildEmbedderGraphCallback(
[](v8::Isolate* isolate, v8::EmbedderGraph* graph, void* data) {
reinterpret_cast<LegacyBuildEmbedderGraphCallback>(data)(isolate,
graph);
},
reinterpret_cast<void*>(callback));
}

void HeapProfiler::AddBuildEmbedderGraphCallback(
BuildEmbedderGraphCallback callback, void* data) {
reinterpret_cast<i::HeapProfiler*>(this)->AddBuildEmbedderGraphCallback(
Expand Down

0 comments on commit b7338b7

Please sign in to comment.