FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: refactor `GetCreationContext` calls · nodejs/node@4733c8e · GitHub

/ node Public

Commit 4733c8e

Browse files
anonrig
authored and
richardlau
committed
src: refactor GetCreationContext calls
PR-URL: #51287 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 7d60877 commit 4733c8e

5 files changed

Lines changed: 12 additions & 14 deletions

File tree

‎src/api/callback.cc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ MaybeLocal<Value> MakeCallback(Isolate* isolate,
248248
Local<Value> argv[],
249249
async_context asyncContext) {
250250
// Check can_call_into_js() first because calling Get() might do so.
251-
Environment* env =
252-
Environment::GetCurrent(recv->GetCreationContext().ToLocalChecked());
251+
Environment* env = Environment::GetCurrent(recv->GetCreationContextChecked());
253252
CHECK_NOT_NULL(env);
254253
if (!env->can_call_into_js()) return Local<Value>();
255254

@@ -279,7 +278,7 @@ MaybeLocal<Value> MakeCallback(Isolate* isolate,
279278
// Because of the AssignToContext() call in src/node_contextify.cc,
280279
// the two contexts need not be the same.
281280
Environment* env =
282-
Environment::GetCurrent(callback->GetCreationContext().ToLocalChecked());
281+
Environment::GetCurrent(callback->GetCreationContextChecked());
283282
CHECK_NOT_NULL(env);
284283
Context::Scope context_scope(env->context());
285284
MaybeLocal<Value> ret =
@@ -302,7 +301,7 @@ MaybeLocal<Value> MakeSyncCallback(Isolate* isolate,
302301
int argc,
303302
Local<Value> argv[]) {
304303
Environment* env =
305-
Environment::GetCurrent(callback->GetCreationContext().ToLocalChecked());
304+
Environment::GetCurrent(callback->GetCreationContextChecked());
306305
CHECK_NOT_NULL(env);
307306
if (!env->can_call_into_js()) return Local<Value>();
308307

‎src/base_object-inl.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ v8::Local<v8::Object> BaseObject::object() const {
5555
v8::Local<v8::Object> BaseObject::object(v8::Isolate* isolate) const {
5656
v8::Local<v8::Object> handle = object();
5757

58-
DCHECK_EQ(handle->GetCreationContext().ToLocalChecked()->GetIsolate(),
59-
isolate);
58+
DCHECK_EQ(handle->GetCreationContextChecked()->GetIsolate(), isolate);
6059
DCHECK_EQ(env()->isolate(), isolate);
6160

6261
return handle;

‎src/module_wrap.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Local<Context> ModuleWrap::context() const {
8888
// If this fails, there is likely a bug e.g. ModuleWrap::context() is accessed
8989
// before the ModuleWrap constructor completes.
9090
CHECK(obj->IsObject());
91-
return obj.As<Object>()->GetCreationContext().ToLocalChecked();
91+
return obj.As<Object>()->GetCreationContextChecked();
9292
}
9393

9494
ModuleWrap* ModuleWrap::GetFromModule(Environment* env,

‎src/node_messaging.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ void MessagePort::OnMessage(MessageProcessingMode mode) {
790790

791791
HandleScope handle_scope(env()->isolate());
792792
Local<Context> context =
793-
object(env()->isolate())->GetCreationContext().ToLocalChecked();
793+
object(env()->isolate())->GetCreationContextChecked();
794794

795795
size_t processing_limit;
796796
if (mode == MessageProcessingMode::kNormalOperation) {
@@ -1048,7 +1048,7 @@ bool GetTransferList(Environment* env,
10481048
void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) {
10491049
Environment* env = Environment::GetCurrent(args);
10501050
Local<Object> obj = args.This();
1051-
Local<Context> context = obj->GetCreationContext().ToLocalChecked();
1051+
Local<Context> context = obj->GetCreationContextChecked();
10521052

10531053
if (args.Length() == 0) {
10541054
return THROW_ERR_MISSING_ARGS(env, "Not enough arguments to "
@@ -1134,9 +1134,9 @@ void MessagePort::ReceiveMessage(const FunctionCallbackInfo<Value>& args) {
11341134
return;
11351135
}
11361136

1137-
MaybeLocal<Value> payload = port->ReceiveMessage(
1138-
port->object()->GetCreationContext().ToLocalChecked(),
1139-
MessageProcessingMode::kForceReadMessages);
1137+
MaybeLocal<Value> payload =
1138+
port->ReceiveMessage(port->object()->GetCreationContextChecked(),
1139+
MessageProcessingMode::kForceReadMessages);
11401140
if (!payload.IsEmpty())
11411141
args.GetReturnValue().Set(payload.ToLocalChecked());
11421142
}
@@ -1547,7 +1547,7 @@ static void MessageChannel(const FunctionCallbackInfo<Value>& args) {
15471547
return;
15481548
}
15491549

1550-
Local<Context> context = args.This()->GetCreationContext().ToLocalChecked();
1550+
Local<Context> context = args.This()->GetCreationContextChecked();
15511551
Context::Scope context_scope(context);
15521552

15531553
MessagePort* port1 = MessagePort::New(env, context);

‎src/node_worker.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ void GetEnvMessagePort(const FunctionCallbackInfo<Value>& args) {
907907
Local<Object> port = env->message_port();
908908
CHECK_IMPLIES(!env->is_main_thread(), !port.IsEmpty());
909909
if (!port.IsEmpty()) {
910-
CHECK_EQ(port->GetCreationContext().ToLocalChecked()->GetIsolate(),
910+
CHECK_EQ(port->GetCreationContextChecked()->GetIsolate(),
911911
args.GetIsolate());
912912
args.GetReturnValue().Set(port);
913913
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL