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

refactor: reduce code duplication in gin_helper::Promise (#43716)

Browse source 
* refactor: move scope scaffolding into SettletScope

idea stolen from SpellCheckScope

* refactor: move impl of PromiseBase::RejectPromise() to the cc file

* chore: remove unused #include
This commit is contained in:
Charles Kerr 2024-09-16 23:08:40 -05:00 • committed by GitHub
parent 05dfd14913
commit b6bf277b6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

93
shell/common/gin_helper/promise.cc
View file

@ -2,13 +2,27 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include <string>
#include <string_view>
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "shell/common/gin_helper/microtasks_scope.h"
#include "shell/common/gin_helper/promise.h"
#include "shell/common/process_util.h"
#include "v8/include/v8-context.h"
namespace gin_helper {
PromiseBase::SettleScope::SettleScope(const PromiseBase& base)
: handle_scope_{base.isolate()},
context_{base.GetContext()},
microtasks_scope_{base.isolate(), context_->GetMicrotaskQueue(), false,
v8::MicrotasksScope::kRunMicrotasks},
context_scope_{context_} {}
PromiseBase::SettleScope::~SettleScope() = default;
PromiseBase::PromiseBase(v8::Isolate* isolate)
: PromiseBase(isolate,
v8::Promise::Resolver::New(isolate->GetCurrentContext())
@ -28,40 +42,30 @@ PromiseBase::~PromiseBase() = default;
PromiseBase& PromiseBase::operator=(PromiseBase&&) = default;
v8::Maybe<bool> PromiseBase::Reject() {
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Context> context = GetContext();
gin_helper::MicrotasksScope microtasks_scope{
isolate(), context->GetMicrotaskQueue(), false,
v8::MicrotasksScope::kRunMicrotasks};
v8::Context::Scope context_scope(context);
return GetInner()->Reject(context, v8::Undefined(isolate()));
// static
scoped_refptr<base::TaskRunner> PromiseBase::GetTaskRunner() {
if (electron::IsBrowserProcess() &&
!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
return content::GetUIThreadTaskRunner({});
}
return {};
}
v8::Maybe<bool> PromiseBase::Reject(v8::Local<v8::Value> except) {
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Context> context = GetContext();
gin_helper::MicrotasksScope microtasks_scope{
isolate(), context->GetMicrotaskQueue(), false,
v8::MicrotasksScope::kRunMicrotasks};
v8::Context::Scope context_scope(context);
return GetInner()->Reject(context, except);
SettleScope settle_scope{*this};
return GetInner()->Reject(settle_scope.context_, except);
}
v8::Maybe<bool> PromiseBase::RejectWithErrorMessage(
const std::string_view message) {
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Context> context = GetContext();
gin_helper::MicrotasksScope microtasks_scope{
isolate(), context->GetMicrotaskQueue(), false,
v8::MicrotasksScope::kRunMicrotasks};
v8::Context::Scope context_scope(context);
v8::Maybe<bool> PromiseBase::Reject() {
SettleScope settle_scope{*this};
return GetInner()->Reject(settle_scope.context_, v8::Undefined(isolate()));
}
v8::Local<v8::Value> error =
v8::Exception::Error(gin::StringToV8(isolate(), message));
return GetInner()->Reject(context, (error));
v8::Maybe<bool> PromiseBase::RejectWithErrorMessage(std::string_view errmsg) {
SettleScope settle_scope{*this};
return GetInner()->Reject(
settle_scope.context_,
v8::Exception::Error(gin::StringToV8(isolate(), errmsg)));
}
v8::Local<v8::Context> PromiseBase::GetContext() const {
@ -76,11 +80,28 @@ v8::Local<v8::Promise::Resolver> PromiseBase::GetInner() const {
return resolver_.Get(isolate());
}
// static
void PromiseBase::RejectPromise(PromiseBase&& promise,
std::string_view errmsg) {
if (auto task_runner = GetTaskRunner()) {
task_runner->PostTask(
FROM_HERE, base::BindOnce(
// Note that this callback can not take std::string_view,
// as StringPiece only references string internally and
// will blow when a temporary string is passed.
[](PromiseBase&& promise, std::string str) {
promise.RejectWithErrorMessage(str);
},
std::move(promise), std::string{errmsg}));
} else {
promise.RejectWithErrorMessage(errmsg);
}
}
// static
void Promise<void>::ResolvePromise(Promise<void> promise) {
if (electron::IsBrowserProcess() &&
!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
content::GetUIThreadTaskRunner({})->PostTask(
if (auto task_runner = GetTaskRunner()) {
task_runner->PostTask(
FROM_HERE,
base::BindOnce([](Promise<void> promise) { promise.Resolve(); },
std::move(promise)));
@ -97,14 +118,8 @@ v8::Local<v8::Promise> Promise<void>::ResolvedPromise(v8::Isolate* isolate) {
}
v8::Maybe<bool> Promise<void>::Resolve() {
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Context> context = GetContext();
gin_helper::MicrotasksScope microtasks_scope{
isolate(), context->GetMicrotaskQueue(), false,
v8::MicrotasksScope::kRunMicrotasks};
v8::Context::Scope context_scope(context);
return GetInner()->Resolve(context, v8::Undefined(isolate()));
SettleScope settle_scope{*this};
return GetInner()->Resolve(settle_scope.context_, v8::Undefined(isolate()));
}
} // namespace gin_helper