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

refactor: update gin_helper/function_template (#41683)

Browse source 
* refactor: update gin_helper/function_template

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* fix: crash in Node.js Worker threads

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-03-25 14:39:25 +01:00 • committed by GitHub
parent f585a4ef37
commit 83777ac83f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 271 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

50
shell/common/gin_helper/function_template.cc
View file

@ -4,10 +4,34 @@
#include "shell/common/gin_helper/function_template.h"
#include "base/observer_list.h"
#include "base/strings/strcat.h"
namespace gin_helper {
CallbackHolderBase::DisposeObserver::DisposeObserver(
gin::PerIsolateData* per_isolate_data,
CallbackHolderBase* holder)
: per_isolate_data_(per_isolate_data), holder_(*holder) {
if (per_isolate_data_)
per_isolate_data_->AddDisposeObserver(this);
}
CallbackHolderBase::DisposeObserver::~DisposeObserver() {
if (per_isolate_data_)
per_isolate_data_->RemoveDisposeObserver(this);
}
void CallbackHolderBase::DisposeObserver::OnBeforeDispose(
v8::Isolate* isolate) {
holder_->v8_ref_.Reset();
}
void CallbackHolderBase::DisposeObserver::OnDisposed() {
// The holder contains the observer, so the observer is destroyed here also.
delete &holder_.get();
}
CallbackHolderBase::CallbackHolderBase(v8::Isolate* isolate)
: v8_ref_(isolate, v8::External::New(isolate, this)) {
: v8_ref_(isolate, v8::External::New(isolate, this)),
dispose_observer_(gin::PerIsolateData::From(isolate), this) {
v8_ref_.SetWeak(this, &CallbackHolderBase::FirstWeakCallback,
v8::WeakCallbackType::kParameter);
}
@ -33,4 +57,28 @@ void CallbackHolderBase::SecondWeakCallback(
delete data.GetParameter();
}
void ThrowConversionError(gin::Arguments* args,
const InvokerOptions& invoker_options,
size_t index) {
if (index == 0 && invoker_options.holder_is_first_argument) {
// Failed to get the appropriate `this` object. This can happen if a
// method is invoked using Function.prototype.[call|apply] and passed an
// invalid (or null) `this` argument.
std::string error =
invoker_options.holder_type
? base::StrCat({"Illegal invocation: Function must be "
"called on an object of type ",
invoker_options.holder_type})
: "Illegal invocation";
args->ThrowTypeError(error);
} else {
// Otherwise, this failed parsing on a different argument.
// Arguments::ThrowError() will try to include appropriate information.
// Ideally we would include the expected c++ type in the error message
// here, too (which we can access via typeid(ArgType).name()), however we
// compile with no-rtti, which disables typeid.
args->ThrowError();
}
}
} // namespace gin_helper