rebase patches

This commit is contained in:
Jeremy Apthorp 2019-05-21 10:05:21 -07:00
parent c832533f5f
commit 446944c677
35 changed files with 180 additions and 180 deletions

View file

@ -29,11 +29,11 @@ index 8b23e02bf42ffdab5d8c6f36a4663ed0668531f7..742aaa1df005f28ba55b0c42a18d41e9
/**
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api.cc b/src/api.cc
index fac25e9713dcf27ce9aff545ba98468fa0545540..e1f16d9594458b5e3aec3b6929634abcce5ee59a 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -520,6 +520,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
diff --git a/src/api/api.cc b/src/api/api.cc
index 62946e00db8cd844a1de7aa16ea8addaa42f6bc6..4a421e73cb45bf3eb3d6643011151743cf989fee 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -514,6 +514,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {
i::V8::SetSnapshotBlob(snapshot_blob);
}