mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
162 lines
5.2 KiB
C++
162 lines
5.2 KiB
C++
// Copyright (c) 2019 GitHub, Inc. All rights reserved.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/gin_helper/callback.h"
|
|
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "gin/dictionary.h"
|
|
#include "shell/common/process_util.h"
|
|
|
|
namespace gin_helper {
|
|
|
|
namespace {
|
|
|
|
struct TranslatorHolder {
|
|
explicit TranslatorHolder(v8::Isolate* isolate)
|
|
: handle(isolate,
|
|
v8::External::New(isolate,
|
|
this,
|
|
v8::kExternalPointerTypeTagDefault)) {
|
|
handle.SetWeak(this, &GC, v8::WeakCallbackType::kParameter);
|
|
}
|
|
~TranslatorHolder() {
|
|
if (!handle.IsEmpty()) {
|
|
handle.ClearWeak();
|
|
handle.Reset();
|
|
}
|
|
}
|
|
|
|
static void GC(const v8::WeakCallbackInfo<TranslatorHolder>& data) {
|
|
delete data.GetParameter();
|
|
}
|
|
|
|
static gin::DeprecatedWrapperInfo kWrapperInfo;
|
|
|
|
v8::Global<v8::External> handle;
|
|
Translator translator;
|
|
};
|
|
|
|
gin::DeprecatedWrapperInfo TranslatorHolder::kWrapperInfo = {
|
|
gin::kEmbedderNativeGin};
|
|
|
|
void CallTranslator(v8::Local<v8::External> external,
|
|
v8::Local<v8::Object> state,
|
|
gin::Arguments* args) {
|
|
// Whether the callback should only be called once.
|
|
v8::Isolate* isolate = args->isolate();
|
|
auto context = isolate->GetCurrentContext();
|
|
bool one_time =
|
|
state->Has(context, gin::StringToSymbol(isolate, "oneTime")).ToChecked();
|
|
|
|
// Check if the callback has already been called.
|
|
if (one_time) {
|
|
auto called_symbol = gin::StringToSymbol(isolate, "called");
|
|
if (state->Has(context, called_symbol).ToChecked()) {
|
|
args->ThrowTypeError("One-time callback was called more than once");
|
|
return;
|
|
} else {
|
|
state->Set(context, called_symbol, v8::True(isolate)).ToChecked();
|
|
}
|
|
}
|
|
|
|
auto* holder = static_cast<TranslatorHolder*>(
|
|
external->Value(v8::kExternalPointerTypeTagDefault));
|
|
holder->translator.Run(args);
|
|
|
|
// Free immediately for one-time callback.
|
|
if (one_time)
|
|
delete holder;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// Destroy the class on UI thread when possible.
|
|
struct DeleteOnUIThread {
|
|
template <typename T>
|
|
static void Destruct(const T* x) {
|
|
if (electron::IsBrowserProcess() &&
|
|
!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
|
|
content::GetUIThreadTaskRunner({})->DeleteSoon(FROM_HERE, x);
|
|
} else {
|
|
delete x;
|
|
}
|
|
}
|
|
};
|
|
|
|
// Like v8::Global, but ref-counted.
|
|
template <typename T>
|
|
class RefCountedGlobal
|
|
: public base::RefCountedThreadSafe<RefCountedGlobal<T>, DeleteOnUIThread> {
|
|
public:
|
|
RefCountedGlobal(v8::Isolate* isolate, v8::Local<v8::Value> value)
|
|
: handle_(isolate, value.As<T>()) {}
|
|
|
|
[[nodiscard]] bool IsAlive() const { return !handle_.IsEmpty(); }
|
|
|
|
v8::Local<T> NewHandle(v8::Isolate* isolate) const {
|
|
return v8::Local<T>::New(isolate, handle_);
|
|
}
|
|
|
|
private:
|
|
v8::Global<T> handle_;
|
|
};
|
|
|
|
SafeV8Function::SafeV8Function(v8::Isolate* isolate, v8::Local<v8::Value> value)
|
|
: v8_function_(new RefCountedGlobal<v8::Function>(isolate, value)) {}
|
|
|
|
SafeV8Function::SafeV8Function(const SafeV8Function& other) = default;
|
|
|
|
SafeV8Function::~SafeV8Function() = default;
|
|
|
|
bool SafeV8Function::IsAlive() const {
|
|
return v8_function_.get() && v8_function_->IsAlive();
|
|
}
|
|
|
|
v8::Local<v8::Function> SafeV8Function::NewHandle(v8::Isolate* isolate) const {
|
|
return v8_function_->NewHandle(isolate);
|
|
}
|
|
|
|
v8::Local<v8::Value> CreateFunctionFromTranslator(v8::Isolate* isolate,
|
|
const Translator& translator,
|
|
bool one_time) {
|
|
gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
|
|
auto* wrapper_info = &TranslatorHolder::kWrapperInfo;
|
|
v8::Local<v8::FunctionTemplate> constructor =
|
|
data->DeprecatedGetFunctionTemplate(wrapper_info);
|
|
// The FunctionTemplate is cached.
|
|
if (constructor.IsEmpty()) {
|
|
constructor =
|
|
CreateFunctionTemplate(isolate, base::BindRepeating(&CallTranslator));
|
|
data->DeprecatedSetFunctionTemplate(wrapper_info, constructor);
|
|
}
|
|
|
|
auto* holder = new TranslatorHolder(isolate);
|
|
holder->translator = translator;
|
|
auto state = gin::Dictionary::CreateEmpty(isolate);
|
|
if (one_time)
|
|
state.Set("oneTime", true);
|
|
auto context = isolate->GetCurrentContext();
|
|
return BindFunctionWith(
|
|
isolate, context, constructor->GetFunction(context).ToLocalChecked(),
|
|
holder->handle.Get(isolate), gin::ConvertToV8(isolate, state));
|
|
}
|
|
|
|
// func.bind(func, arg1).
|
|
// NB(zcbenz): Using C++11 version crashes VS.
|
|
v8::Local<v8::Value> BindFunctionWith(v8::Isolate* isolate,
|
|
v8::Local<v8::Context> context,
|
|
v8::Local<v8::Function> func,
|
|
v8::Local<v8::Value> arg1,
|
|
v8::Local<v8::Value> arg2) {
|
|
v8::MaybeLocal<v8::Value> bind =
|
|
func->Get(context, gin::StringToV8(isolate, "bind"));
|
|
CHECK(!bind.IsEmpty());
|
|
v8::Local<v8::Function> bind_func = bind.ToLocalChecked().As<v8::Function>();
|
|
v8::Local<v8::Value> converted[] = {func, arg1, arg2};
|
|
return bind_func->Call(context, func, std::size(converted), converted)
|
|
.ToLocalChecked();
|
|
}
|
|
|
|
} // namespace gin_helper
|