mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04: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>
197 lines
7.0 KiB
C++
197 lines
7.0 KiB
C++
// Copyright (c) 2025 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/gin_converters/osr_converter.h"
|
|
|
|
#include "gin/dictionary.h"
|
|
#include "v8-external.h"
|
|
#include "v8-function.h"
|
|
|
|
#include <string>
|
|
|
|
#include "base/containers/to_vector.h"
|
|
#include "base/task/single_thread_task_runner.h"
|
|
#if BUILDFLAG(IS_LINUX)
|
|
#include "base/strings/string_number_conversions.h"
|
|
#endif
|
|
#include "shell/common/gin_converters/gfx_converter.h"
|
|
#include "shell/common/gin_converters/optional_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/node_util.h"
|
|
|
|
namespace gin {
|
|
|
|
namespace {
|
|
std::string OsrVideoPixelFormatToString(media::VideoPixelFormat format) {
|
|
switch (format) {
|
|
case media::PIXEL_FORMAT_ARGB:
|
|
return "bgra";
|
|
case media::PIXEL_FORMAT_ABGR:
|
|
return "rgba";
|
|
case media::PIXEL_FORMAT_RGBAF16:
|
|
return "rgbaf16";
|
|
default:
|
|
NOTREACHED();
|
|
}
|
|
}
|
|
|
|
std::string OsrWidgetTypeToString(content::WidgetType type) {
|
|
switch (type) {
|
|
case content::WidgetType::kPopup:
|
|
return "popup";
|
|
case content::WidgetType::kFrame:
|
|
return "frame";
|
|
default:
|
|
NOTREACHED();
|
|
}
|
|
}
|
|
|
|
struct OffscreenReleaseHolderMonitor {
|
|
explicit OffscreenReleaseHolderMonitor(
|
|
electron::OffscreenReleaserHolder* holder)
|
|
: holder_(holder) {
|
|
CHECK(holder);
|
|
}
|
|
|
|
void ReleaseTexture() {
|
|
delete holder_;
|
|
holder_ = nullptr;
|
|
}
|
|
|
|
[[nodiscard]] bool IsTextureReleased() const { return holder_ == nullptr; }
|
|
|
|
v8::Persistent<v8::Value>* CreatePersistent(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> value) {
|
|
persistent_ = std::make_unique<v8::Persistent<v8::Value>>(isolate, value);
|
|
return persistent_.get();
|
|
}
|
|
|
|
void ResetPersistent() const { persistent_->Reset(); }
|
|
|
|
private:
|
|
raw_ptr<electron::OffscreenReleaserHolder> holder_;
|
|
std::unique_ptr<v8::Persistent<v8::Value>> persistent_;
|
|
};
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
v8::Local<v8::Value> Converter<electron::OffscreenSharedTextureValue>::ToV8(
|
|
v8::Isolate* isolate,
|
|
const electron::OffscreenSharedTextureValue& val) {
|
|
gin::Dictionary root(isolate, v8::Object::New(isolate));
|
|
|
|
// Create a monitor to hold the releaser holder, which enables us to
|
|
// monitor whether the user explicitly released the texture before
|
|
// GC collects the object.
|
|
auto* monitor = new OffscreenReleaseHolderMonitor(val.releaser_holder);
|
|
|
|
auto releaserHolder =
|
|
v8::External::New(isolate, monitor, v8::kExternalPointerTypeTagDefault);
|
|
auto releaserFunc = [](const v8::FunctionCallbackInfo<v8::Value>& info) {
|
|
auto* mon = static_cast<OffscreenReleaseHolderMonitor*>(
|
|
info.Data().As<v8::External>()->Value(
|
|
v8::kExternalPointerTypeTagDefault));
|
|
// Release the shared texture, so that future frames can be generated.
|
|
mon->ReleaseTexture();
|
|
// Release the monitor happens at GC, don't release here.
|
|
};
|
|
auto releaser = v8::Function::New(isolate->GetCurrentContext(), releaserFunc,
|
|
releaserHolder)
|
|
.ToLocalChecked();
|
|
|
|
root.Set("release", releaser);
|
|
|
|
gin::Dictionary dict(isolate, v8::Object::New(isolate));
|
|
dict.Set("pixelFormat", OsrVideoPixelFormatToString(val.pixel_format));
|
|
dict.Set("codedSize", val.coded_size);
|
|
dict.Set("visibleRect", val.visible_rect);
|
|
dict.Set("contentRect", val.content_rect);
|
|
dict.Set("timestamp", val.timestamp);
|
|
dict.Set("colorSpace", val.color_space);
|
|
dict.Set("widgetType", OsrWidgetTypeToString(val.widget_type));
|
|
|
|
gin::Dictionary metadata(isolate, v8::Object::New(isolate));
|
|
metadata.Set("captureUpdateRect", val.capture_update_rect);
|
|
metadata.Set("regionCaptureRect", val.region_capture_rect);
|
|
metadata.Set("sourceSize", val.source_size);
|
|
metadata.Set("frameCount", val.frame_count);
|
|
dict.Set("metadata", ConvertToV8(isolate, metadata));
|
|
|
|
gin::Dictionary sharedTexture(isolate, v8::Object::New(isolate));
|
|
#if BUILDFLAG(IS_WIN)
|
|
sharedTexture.Set(
|
|
"ntHandle",
|
|
electron::Buffer::Copy(
|
|
isolate, base::byte_span_from_ref(val.shared_texture_handle))
|
|
.ToLocalChecked());
|
|
#elif BUILDFLAG(IS_MAC)
|
|
sharedTexture.Set(
|
|
"ioSurface",
|
|
electron::Buffer::Copy(
|
|
isolate, base::byte_span_from_ref(val.shared_texture_handle))
|
|
.ToLocalChecked());
|
|
#elif BUILDFLAG(IS_LINUX)
|
|
gin::Dictionary nativePixmap(isolate, v8::Object::New(isolate));
|
|
auto v8_planes = base::ToVector(val.planes, [isolate](const auto& plane) {
|
|
gin::Dictionary v8_plane(isolate, v8::Object::New(isolate));
|
|
v8_plane.Set("stride", plane.stride);
|
|
v8_plane.Set("offset", plane.offset);
|
|
v8_plane.Set("size", plane.size);
|
|
v8_plane.Set("fd", plane.fd);
|
|
return v8_plane;
|
|
});
|
|
nativePixmap.Set("planes", v8_planes);
|
|
nativePixmap.Set("modifier", base::NumberToString(val.modifier));
|
|
nativePixmap.Set("supportsZeroCopyWebGpuImport",
|
|
val.supports_zero_copy_webgpu_import);
|
|
sharedTexture.Set("nativePixmap", ConvertToV8(isolate, nativePixmap));
|
|
#endif
|
|
|
|
dict.Set("handle", ConvertToV8(isolate, sharedTexture));
|
|
root.Set("textureInfo", ConvertToV8(isolate, dict));
|
|
auto root_local = ConvertToV8(isolate, root);
|
|
|
|
// Create a persistent reference of the object, so that we can check the
|
|
// monitor again when GC collects this object.
|
|
auto* tex_persistent = monitor->CreatePersistent(isolate, root_local);
|
|
tex_persistent->SetWeak(
|
|
monitor,
|
|
[](const v8::WeakCallbackInfo<OffscreenReleaseHolderMonitor>& data) {
|
|
auto* monitor = data.GetParameter();
|
|
if (!monitor->IsTextureReleased()) {
|
|
// Emit a warning when user didn't properly manually release the
|
|
// texture, output it in second pass callback.
|
|
data.SetSecondPassCallback([](const v8::WeakCallbackInfo<
|
|
OffscreenReleaseHolderMonitor>& data) {
|
|
// Emit warning only once
|
|
static std::once_flag flag;
|
|
std::call_once(flag, [=] {
|
|
base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
|
|
FROM_HERE, base::BindOnce([] {
|
|
electron::util::EmitWarning(
|
|
"Offscreen rendering shared texture was garbage "
|
|
"collected before calling `release()`. When using OSR "
|
|
"with `useSharedTexture: true`, `texture.release()` "
|
|
"must be called explicitly as soon as the texture is "
|
|
"copied to your rendering system. Otherwise, it will "
|
|
"soon drain the underlying frame pool and prevent "
|
|
"future frames from being sent.",
|
|
"OSRSharedTextureNotReleased");
|
|
}));
|
|
});
|
|
});
|
|
}
|
|
// We are responsible for resetting the persistent handle.
|
|
monitor->ResetPersistent();
|
|
// Finally, release the holder monitor.
|
|
delete monitor;
|
|
},
|
|
v8::WeakCallbackType::kParameter);
|
|
|
|
return root_local;
|
|
}
|
|
|
|
} // namespace gin
|