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>
186 lines
6.4 KiB
C++
186 lines
6.4 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include <optional>
|
|
#include <set>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include "base/files/file_util.h"
|
|
#include "base/task/thread_pool.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "base/trace_event/trace_config.h"
|
|
#include "content/public/browser/tracing_controller.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/gin_converters/file_path_converter.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
using content::TracingController;
|
|
using namespace std::literals;
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<base::trace_event::TraceConfig> {
|
|
static bool FromV8(v8::Isolate* isolate,
|
|
v8::Local<v8::Value> val,
|
|
base::trace_event::TraceConfig* out) {
|
|
// (alexeykuzmin): A combination of "categoryFilter" and "traceOptions"
|
|
// has to be checked first because none of the fields
|
|
// in the `memory_dump_config` dict below are mandatory
|
|
// and we cannot check the config format.
|
|
gin_helper::Dictionary options;
|
|
if (ConvertFromV8(isolate, val, &options)) {
|
|
std::string category_filter, trace_options;
|
|
if (options.Get("categoryFilter", &category_filter) &&
|
|
options.Get("traceOptions", &trace_options)) {
|
|
*out = base::trace_event::TraceConfig(category_filter, trace_options);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
base::DictValue memory_dump_config;
|
|
if (ConvertFromV8(isolate, val, &memory_dump_config)) {
|
|
*out = base::trace_event::TraceConfig(std::move(memory_dump_config));
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace {
|
|
|
|
using CompletionCallback = base::OnceCallback<void(const base::FilePath&)>;
|
|
|
|
std::optional<base::FilePath> CreateTemporaryFileOnIO() {
|
|
base::FilePath temp_file_path;
|
|
if (!base::CreateTemporaryFile(&temp_file_path))
|
|
return std::nullopt;
|
|
return std::make_optional(std::move(temp_file_path));
|
|
}
|
|
|
|
void StopTracing(gin_helper::Promise<base::FilePath> promise,
|
|
std::optional<base::FilePath> file_path) {
|
|
auto resolve_or_reject = base::BindOnce(
|
|
[](gin_helper::Promise<base::FilePath> promise,
|
|
const base::FilePath& path, const std::string_view error) {
|
|
if (!std::empty(error)) {
|
|
promise.RejectWithErrorMessage(error);
|
|
} else {
|
|
promise.Resolve(path);
|
|
}
|
|
},
|
|
std::move(promise), *file_path);
|
|
|
|
auto* instance = TracingController::GetInstance();
|
|
if (!instance->IsTracing()) {
|
|
std::move(resolve_or_reject)
|
|
.Run("Failed to stop tracing - no trace in progress"sv);
|
|
} else if (file_path) {
|
|
auto split_callback = base::SplitOnceCallback(std::move(resolve_or_reject));
|
|
auto endpoint = TracingController::CreateFileEndpoint(
|
|
*file_path, base::BindOnce(std::move(split_callback.first), ""sv));
|
|
if (!instance->StopTracing(endpoint)) {
|
|
std::move(split_callback.second).Run("Failed to stop tracing"sv);
|
|
}
|
|
} else {
|
|
std::move(resolve_or_reject)
|
|
.Run("Failed to create temporary file for trace data"sv);
|
|
}
|
|
}
|
|
|
|
v8::Local<v8::Promise> StopRecording(gin::Arguments* const args) {
|
|
gin_helper::Promise<base::FilePath> promise{args->isolate()};
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
base::FilePath path;
|
|
if (args->GetNext(&path) && !path.empty()) {
|
|
StopTracing(std::move(promise), std::make_optional(path));
|
|
} else {
|
|
// use a temporary file.
|
|
base::ThreadPool::PostTaskAndReplyWithResult(
|
|
FROM_HERE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE},
|
|
base::BindOnce(CreateTemporaryFileOnIO),
|
|
base::BindOnce(StopTracing, std::move(promise)));
|
|
}
|
|
|
|
return handle;
|
|
}
|
|
|
|
v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
|
|
gin_helper::Promise<const std::set<std::string>&> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
// Note: This method always succeeds.
|
|
TracingController::GetInstance()->GetCategories(base::BindOnce(
|
|
gin_helper::Promise<const std::set<std::string>&>::ResolvePromise,
|
|
std::move(promise)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
v8::Local<v8::Promise> StartTracing(
|
|
v8::Isolate* isolate,
|
|
const base::trace_event::TraceConfig& trace_config) {
|
|
gin_helper::Promise<void> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (!TracingController::GetInstance()->StartTracing(
|
|
trace_config,
|
|
base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
|
|
std::move(promise)))) {
|
|
// If StartTracing returns false, that means it didn't invoke its callback.
|
|
// Return an already-resolved promise and abandon the previous promise (it
|
|
// was std::move()d into the StartTracing callback and has been deleted by
|
|
// this point).
|
|
return gin_helper::Promise<void>::ResolvedPromise(isolate);
|
|
}
|
|
return handle;
|
|
}
|
|
|
|
void OnTraceBufferUsageAvailable(
|
|
gin_helper::Promise<gin_helper::Dictionary> promise,
|
|
float percent_full,
|
|
size_t approximate_count) {
|
|
auto dict = gin_helper::Dictionary::CreateEmpty(promise.isolate());
|
|
dict.Set("percentage", percent_full);
|
|
dict.Set("value", approximate_count);
|
|
|
|
promise.Resolve(dict);
|
|
}
|
|
|
|
v8::Local<v8::Promise> GetTraceBufferUsage(v8::Isolate* isolate) {
|
|
gin_helper::Promise<gin_helper::Dictionary> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
// Note: This method always succeeds.
|
|
TracingController::GetInstance()->GetTraceBufferUsage(
|
|
base::BindOnce(&OnTraceBufferUsageAvailable, std::move(promise)));
|
|
return handle;
|
|
}
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
v8::Isolate* const isolate = electron::JavascriptEnvironment::GetIsolate();
|
|
gin_helper::Dictionary dict{isolate, exports};
|
|
dict.SetMethod("getCategories", &GetCategories);
|
|
dict.SetMethod("startRecording", &StartTracing);
|
|
dict.SetMethod("stopRecording", &StopRecording);
|
|
dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_content_tracing, Initialize)
|