feaf18e371
* chore: bump chromium in DEPS to 112.0.5576.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4191759: Reuse PrintBackend process from query for printing https://chromium-review.googlesource.com/c/chromium/src/+/4191759 * 4189718: Revert "[code health] Remove NotificationService use by SpellcheckService" https://chromium-review.googlesource.com/c/chromium/src/+/4189718 * 4216074: web_contents_delegate: remove content:: https://chromium-review.googlesource.com/c/chromium/src/+/4216074 * 4192284: ios: Add feature flag for PartitionAlloc. https://chromium-review.googlesource.com/c/chromium/src/+/4192284 * chore: bump chromium in DEPS to 112.0.5578.0 * 4211172: Use the Mac ImageTransportSurface on iOS. https://chromium-review.googlesource.com/c/chromium/src/+/4211172 * 4067682: Define ThirdPartyCookiesUserBypass runtime feature and plumb it through to URLRequest.cookie_setting_overrides. https://chromium-review.googlesource.com/c/chromium/src/+/4067682 * chore: fixup patch indices * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: fixup patch indices * chore: bump chromium in DEPS to 112.0.5579.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5581.0 * chore: update patches * refactor: use modern base values in tracing Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4210912 * refactor: remove GetFontLookupTableCacheDir Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4191820 * refactor: base value type DICTIONARY replaced with DICT Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4198081 * chore: add stub impls for WCO routing Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4182690 * refactor: rename latency metrics Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4048262 * refactor: add sanitized context to clipboard write Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4178264 * refactor: s/Rect/WindowFeatures Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4167001 * refacotr: switch mojom::NetworkHintsHandler to use SchemeHostPair instead of URL Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4185417 * chore: remove dead DecodeToken code * refactor: refactoring geolocation manager Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4161603 * chore: iwyu net/cert/cert_verify_result.h * build: use xcode 14 * chore: bump chromium in DEPS to 112.0.5583.0 * chore: update patches * chore: fixup mas patches * refactor: base::span explicit conversion checks Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4219636 * chore: bump chromium in DEPS to 112.0.5591.0 * chore: bump chromium in DEPS to 112.0.5593.0 * chore: bump chromium in DEPS to 112.0.5594.3 * chore: bump chromium in DEPS to 112.0.5597.0 * chore: update chromium patches * 4242507: Move most of GetChromeKeySystems() into components/cdm Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4242507 It seems as though the bug this patch was trying to resolve is now fixed. * chore: update v8 patches * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4247938: Bump min required GTK version to 3.20 Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4247938 * 4173660: Remove unused argument in BeforeUnloadCompleted Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4173660 * 4226656: Add response url to SimpleURLLoader::OnRedirectCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4226656 * fixup!: 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManager Host. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * chore: bump chromium in DEPS to 112.0.5599.0 * chore: update patches * 4251237: [StorageKey Cleanup] (2) Rename CreateFirstParty constructors Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4251237 * 4256866: [Extensions] Replace GetHooksForAPI with a RegisterHooksDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4256866 * chore: bump chromium in DEPS to 112.0.5601.0 * chore: update patches * chore: bump chromium in DEPS to 112.0.5603.0 * chore: bump chromium in DEPS to 112.0.5605.0 * chore: bump chromium in DEPS to 112.0.5607.0 * update patches * fix mas patch * chore: bump chromium in DEPS to 112.0.5609.0 * chore: update patches * build: update appveyor image 4072083: New toolchain for Windows 11 10.0.22621.755 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/4072083 * chore: bump chromium in DEPS to 112.0.5611.0 * fix patches * chore: update patches * 4261434: Remove browser_watcher (1/3): Move ExitCodeWatcher to chrome/app https://chromium-review.googlesource.com/c/chromium/src/+/4261434 * 4258446: Move network::mojom::ClearDataFilter to its own mojom file https://chromium-review.googlesource.com/c/chromium/src/+/4258446 * 4128591: Enable large pdbs by default https://chromium-review.googlesource.com/c/chromium/src/+/4128591 * move dbgcore/dbghelp to extensions_to_skip * chore: bump chromium in DEPS to 113.0.5624.0 * chore: bump chromium in DEPS to 113.0.5626.0 * chore: bump chromium in DEPS to 113.0.5628.2 * chore: bump chromium in DEPS to 113.0.5630.0 * chore: bump chromium in DEPS to 113.0.5632.0 * chore: bump chromium in DEPS to 113.0.5634.0 * chore: bump chromium in DEPS to 113.0.5636.0 * 4255184: Permit popups from fullscreen-within-tab openers https://chromium-review.googlesource.com/c/chromium/src/+/4255184 * 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth https://chromium-review.googlesource.com/c/chromium/src/+/4297715 * 4301154: Remove GLContextCGL and cleanup relevant code https://chromium-review.googlesource.com/c/chromium/src/+/4301154 * 4278389: CDP: fix Page.addScriptToEvaluateOnNewDocument in iframes https://chromium-review.googlesource.com/c/chromium/src/+/4278389 * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * 4291989: Refactor logic determining untrusted mojo invitation flag. https://chromium-review.googlesource.com/c/chromium/src/+/4291989 * 4110189: Add Select option to content touch selection menu. https://chromium-review.googlesource.com/c/chromium/src/+/4110189 * 4309923: [Extensions] Add a unit test for API permissions having features https://chromium-review.googlesource.com/c/chromium/src/+/4309923 * 4282657: Revert "[headless] Route stdio to parent console on Windows." https://chromium-review.googlesource.com/c/chromium/src/+/4282657 * 4306685: [v8] Improve V8 flag configuration to avoid errors https://chromium-review.googlesource.com/c/chromium/src/+/4306685 * 4295455: Add fallback Linux UI for when GTK 3.20 isn't available https://chromium-review.googlesource.com/c/chromium/src/+/4295455 * 4289774: Remove feature for shared sandbox policies https://chromium-review.googlesource.com/c/chromium/src/+/4289774 * 4292705: Rename WebSwapCGLLayer to ANGLESwapCGLLayer outside WebKit. https://chromium-review.googlesource.com/c/angle/angle/+/4292705 * chore: fixup patch indices * fixup! 4297715: [mac] Introduce BluetoothLowEnergyAdapterApple to reuse CoreBluetooth * 4289789: Remove base::JSONReader::ReadDeprecated https://chromium-review.googlesource.com/c/chromium/src/+/4289789 * 4281521: Remove `base::Value::FindKey()` https://chromium-review.googlesource.com/c/chromium/src/+/4281521 * 4276761: Update NAK constructor and GetIsCrossSite https://chromium-review.googlesource.com/c/chromium/src/+/4276761 * 4288119: Let GetUpload work with UploadInfo pointers https://chromium-review.googlesource.com/c/chromium/src/+/4288119 * 4285322: content: Move WebExposedIsolationLevel to its own public header https://chromium-review.googlesource.com/c/chromium/src/+/4285322 * 4251818: [Extensions] Make ExtensionSet moveable. https://chromium-review.googlesource.com/c/chromium/src/+/4251818 * 4299554: [json-schema-compiler] Refactor to Params::Create (14/74) https://chromium-review.googlesource.com/c/chromium/src/+/4299554 * chore: update printing patch indices * chore: update chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4295455 Our patch changes the signature of `LinuxUiTheme::GetWindowFrameProvider()`. Upstream 4295455 added a new subclass (FallbackLinuxUi) so sync its version of GetWindowFrameProvider() to match our changes. * chore: disable node test parallel/test-intl Disabling the test because upstream is still working on this feature. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4237675 Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1414292 When upstream churn is done we should re-enable this test and update it as necessary. * win7dep: Remove ResolveCoreWinRTStringDelayload Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4277708 Upstream has removed this since Win7 support is deprecated. This updates our `language_util_win.cc` file using the same approach that 4277708 uses for `base/win/win_util.cc`. * fix: remove use of ResolveCoreWinRTDelayload() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297979 A followup to prev commit, which removed ResolveCoreWinRTStringDelayload(). This PR follows the 4297979 approach of simply removing the calls, e.g. https://chromium-review.googlesource.com/c/chromium/src/+/4297979/4/chrome/browser/device_reauth/win/authenticator_win.cc * fix: add d3dcompiler_47 to the zip manifest Xref: https://chromium-review.googlesource.com/c/angle/angle/+/4285717 Xref (24-x-y):0fb1def32b
* This clang roll breaks Linux arm 32-bit Xref (24-x-y):1229114494
Xref (chromium): https://crbug.com/1410101 * fix: WebUSB on ARM64 macs (#37441) * chore: update patches * chore: fix macOS CI build. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4278307 That whole dir was previously being removed to save space since we don't use it. We still don't use anything in the file, but gn needs it to exist. * fixup! chore: fix macOS CI build. chore: mkdir --parents does not exist on BSD; use mkdir -p * chore: update chromium/mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4273450 Upstream added a new block of code using NSAccessibilityRemoteUIElement, so stub it out with `#if !IS_MAS_BUILD()` same as we do everwhere else. * chore: address code review nit :) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
180 lines
6.2 KiB
C++
180 lines
6.2 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 <set>
|
|
#include <string>
|
|
#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/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"
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
|
|
using content::TracingController;
|
|
|
|
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::Value::Dict 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&)>;
|
|
|
|
absl::optional<base::FilePath> CreateTemporaryFileOnIO() {
|
|
base::FilePath temp_file_path;
|
|
if (!base::CreateTemporaryFile(&temp_file_path))
|
|
return absl::nullopt;
|
|
return absl::make_optional(std::move(temp_file_path));
|
|
}
|
|
|
|
void StopTracing(gin_helper::Promise<base::FilePath> promise,
|
|
absl::optional<base::FilePath> file_path) {
|
|
auto resolve_or_reject = base::BindOnce(
|
|
[](gin_helper::Promise<base::FilePath> promise,
|
|
const base::FilePath& path, absl::optional<std::string> error) {
|
|
if (error) {
|
|
promise.RejectWithErrorMessage(error.value());
|
|
} else {
|
|
promise.Resolve(path);
|
|
}
|
|
},
|
|
std::move(promise), *file_path);
|
|
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), absl::nullopt));
|
|
if (!TracingController::GetInstance()->StopTracing(endpoint)) {
|
|
std::move(split_callback.second)
|
|
.Run(absl::make_optional(
|
|
"Failed to stop tracing (was a trace in progress?)"));
|
|
}
|
|
} else {
|
|
std::move(resolve_or_reject)
|
|
.Run(absl::make_optional(
|
|
"Failed to create temporary file for trace data"));
|
|
}
|
|
}
|
|
|
|
v8::Local<v8::Promise> StopRecording(gin_helper::Arguments* 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), absl::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) {
|
|
gin_helper::Dictionary dict = gin::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) {
|
|
gin_helper::Dictionary dict(context->GetIsolate(), 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)
|