mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: explicit microtask scope DCHECK condition (#47140)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
This commit is contained in:
trop[bot] 2025-05-19 21:01:05 +02:00 • committed by GitHub
commit bbb6aabe41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shell/common/node_util.cc
View file

@ -15,6 +15,7 @@
#include "shell/browser/javascript_environment.h" #include "shell/browser/javascript_environment.h"
#include "shell/common/gin_converters/callback_converter.h" #include "shell/common/gin_converters/callback_converter.h"
#include "shell/common/node_includes.h" #include "shell/common/node_includes.h"
#include "shell/common/process_util.h"
#include "third_party/electron_node/src/node_process-inl.h" #include "third_party/electron_node/src/node_process-inl.h"
namespace electron::util { namespace electron::util {
@ -132,7 +133,17 @@ node::Environment* CreateEnvironment(v8::Isolate* isolate,
ExplicitMicrotasksScope::ExplicitMicrotasksScope(v8::MicrotaskQueue* queue) ExplicitMicrotasksScope::ExplicitMicrotasksScope(v8::MicrotaskQueue* queue)
: microtask_queue_(queue), original_policy_(queue->microtasks_policy()) { : microtask_queue_(queue), original_policy_(queue->microtasks_policy()) {
// In browser-like processes, some nested run loops (macOS usually) may
// re-enter. This is safe because we expect the policy was explicit in the
// first place for those processes. However, in renderer processes, there may
// be unexpected behavior if this code is triggered within a pending microtask
// scope.
if (electron::IsBrowserProcess() || electron::IsUtilityProcess()) {
DCHECK_EQ(original_policy_, v8::MicrotasksPolicy::kExplicit);
} else {
DCHECK_EQ(microtask_queue_->GetMicrotasksScopeDepth(), 0); DCHECK_EQ(microtask_queue_->GetMicrotasksScopeDepth(), 0);
}
microtask_queue_->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit); microtask_queue_->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit);
} }