Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: src/api.cc

Issue 989153003: remove phantom naming from the api (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/v8-util.h ('k') | src/debug.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 31f877284ef72b3e3a0dc6651c078b19d4cbffa9..f0c105cffc9817c8e302b9b06f92b771eec3246d 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -567,21 +567,29 @@ void V8::MakeWeak(i::Object** object, void* parameter,
}
-void V8::MakePhantom(i::Object** object, void* parameter,
- int internal_field_index1, int internal_field_index2,
- PhantomCallbackData<void>::Callback weak_callback) {
+void V8::MakeWeak(i::Object** object, void* parameter,
+ int internal_field_index1, int internal_field_index2,
+ WeakCallbackInfo<void>::Callback weak_callback) {
+ WeakCallbackType type = WeakCallbackType::kParameter;
if (internal_field_index1 == 0) {
if (internal_field_index2 == 1) {
- i::GlobalHandles::MakePhantom(object, parameter, 2, weak_callback);
+ type = WeakCallbackType::kInternalFields;
} else {
- DCHECK_EQ(internal_field_index2, kNoInternalFieldIndex);
- i::GlobalHandles::MakePhantom(object, parameter, 1, weak_callback);
+ DCHECK_EQ(internal_field_index2, -1);
+ type = WeakCallbackType::kInternalFields;
}
} else {
- DCHECK_EQ(internal_field_index1, kNoInternalFieldIndex);
- DCHECK_EQ(internal_field_index2, kNoInternalFieldIndex);
- i::GlobalHandles::MakePhantom(object, parameter, 0, weak_callback);
+ DCHECK_EQ(internal_field_index1, -1);
+ DCHECK_EQ(internal_field_index2, -1);
}
+ i::GlobalHandles::MakeWeak(object, parameter, weak_callback, type);
+}
+
+
+void V8::MakeWeak(i::Object** object, void* parameter,
+ WeakCallbackInfo<void>::Callback weak_callback,
+ WeakCallbackType type) {
+ i::GlobalHandles::MakeWeak(object, parameter, weak_callback, type);
}
« no previous file with comments | « include/v8-util.h ('k') | src/debug.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698