mirror of
https://github.com/electron/electron.git
synced 2026-02-26 03:01:17 -05:00
* chore: Bump 78.0.3894.0 * chore: bump chromium to 32e0bab929213da1019992bf31d29 (master) (#19488) * chore: bump chromium to cbeb16cf544f79c1990f1eae4d4fe (master) (#19610) Co-authored-by: Erick Zhao <erickzhao@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by Micha Hanselmann <DeerMichel@github.com> * chore: bump chromium to 62327c655093c821aa0fcfc6db53f5fd943e08c7 (master) (#19792) * chore: bump chromium in DEPS to f3bf493731e868e1f5f48e7e1adc02ea5eccfbbd * chore: bump chromium in DEPS to 4db0c87d4aa6f27ffa0b5fc77d20e10047962484 * chore: bump chromium in DEPS to d933a504c264dc8fe85267f47aef3588531875b5 * chore: bump chromium in DEPS to 34afdb68980f581ae911b85b727bc17e126cf5f9 * update disable-redraw-lock.patch https://chromium-review.googlesource.com/c/chromium/src/+/1600387 * update desktop_media_list.patch https://chromium-review.googlesource.com/c/chromium/src/+/1729156 * update notification_provenance.patch https://chromium-review.googlesource.com/c/chromium/src/+/1742779 * update printing.patch https://chromium-review.googlesource.com/c/chromium/src/+/1646772 * update verbose_generate_bpad_syms.patch https://chromium-review.googlesource.com/c/chromium/src/+/1745986 * update patch metadata * remove printing_compositor manifests https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * update for URLLoaderFactoryType enum https://chromium-review.googlesource.com/c/chromium/src/+/1754716 * remove gin string16 converter https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * ClearCompositorFrame() has been removed https://chromium-review.googlesource.com/c/chromium/src/+/1746301 * message_loop -> message_loop_current https://chromium-review.googlesource.com/c/chromium/src/+/1738552 * include resource_response header * pdf compositor no longer uses service manager https://chromium-review.googlesource.com/c/chromium/src/+/1742734 * chore: bump chromium in DEPS to 00d5933101d8d8dc9546eadbe7ee1b41077e6db1 * pane focus fns aren't pure virtual anymore https://chromium-review.googlesource.com/c/chromium/src/+/1708767 * fix: make std::hash value-non-const broken by https://chromium-review.googlesource.com/c/chromium/src/+/1711202 * update swiftshader in zip_manifests https://swiftshader-review.googlesource.com/c/SwiftShader/+/34911 * address feedback from @deepak1556 * don't enable kLegacyWindowsDWriteFontFallback https://chromium-review.googlesource.com/c/chromium/src/+/1753006 * chore: bump chromium in DEPS to 84497314005e1968da06804f8fde539d9872310e * update printing.patch remove bottom diff owing to https://chromium-review.googlesource.com/c/chromium/src/+/1678182 and update for https://chromium-review.googlesource.com/c/chromium/src/+/1678182 * convert CookieChangeListener to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1753371 * rename ui::ClipboardType -> ui::ClipboardBuffer https://chromium-review.googlesource.com/c/chromium/src/+/1758730 * logging::LoggingSettings log_file -> log_file_path https://chromium-review.googlesource.com/c/chromium/src/+/1699477 * roll DEPS to latest lkgr * fix: override GetFontLookupTableCacheDir() When Chromium goes to use its fallback font table creation code paths, it creates the cache directory it uses by calling GetFontLookupTableCacheDir() with a path that doesn't exist in Electron. To ensure that a legitimate file path is created, we need to override it with Electron's DIR_USER_DATA so it doesn't use chrome::DIR_USER_DATA. * chore: bump chromium in DEPS to 6758a0879931bc4df630a80a36c82d7855ae3155 * update pthread_fchdir patch https://chromium-review.googlesource.com/c/chromium/src/+/1759149 * update printing patch * update cookie usage and fn signatures https://chromium-review.googlesource.com/c/chromium/src/+/1758437 * chore: bump chromium in DEPS to bdaca97e1cc27fb977e56f30f74cdb906da9527e * remove fix_make_std_hash_value-non-const.patch https://chromium-review.googlesource.com/c/chromium/src/+/1762335 * Convert enum to enum class for FocusManager::FocusChangeReason https://chromium-review.googlesource.com/c/chromium/src/+/1767281 * roll DEPS to latest lkgr * update dom_storage_limits.patch https://chromium-review.googlesource.com/c/chromium/src/+/1767556 * chore: remove pre network service classes from shell/browser/net (#19644) * refactor: rm IOThread class * chore: rm expose-net-observer-api.patch * chore: rm unused shell/browser/net/ classes * chore: mv CertVerifierClient to separate header * chore: rm url_request_context_getter references * chore: update patches * Require task posters to specify an explicit destination https://chromium-review.googlesource.com/c/chromium/src/+/1769080 * chore: Revert "Cleanup: Remove Menu Subtitles/Sublabels" * chore: Bump chromium 78.0.3896.0 * build: add checkout_openxr=False to DEPS Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1745502 * chore: update patches * Convert TrustedURLLoaderHeaderClient and TrustedHeaderClient to new mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1767298 https://chromium-review.googlesource.com/c/chromium/src/+/1768841 * skia: more rect api simplifications https://skia-review.googlesource.com/c/skia/+/237038 * iwyu * test: fix clearAuthCache test (#20015) * fix: nws13n: make ses.setUserAgent work (#20014) * refactor tests to better control window creation * fix: nws13n: make ses.setUserAgent work * chore: update v8 patches * Add enterprise policy for renderer CIG. https://chromium-review.googlesource.com/c/chromium/src/+/1758589 * Convert enum to enum class for Wigdet::FrameType https://chromium-review.googlesource.com/c/chromium/src/+/1767292 * [JJI] Convert to use string16 for data from JavaScript/Java https://chromium-review.googlesource.com/c/chromium/src/+/1750093 * chore: Bump chromium 78.0.3896.6
167 lines
5.6 KiB
C++
167 lines
5.6 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/bind.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/optional.h"
|
|
#include "base/threading/thread_restrictions.h"
|
|
#include "content/public/browser/tracing_controller.h"
|
|
#include "native_mate/dictionary.h"
|
|
#include "shell/common/native_mate_converters/callback.h"
|
|
#include "shell/common/native_mate_converters/file_path_converter.h"
|
|
#include "shell/common/native_mate_converters/value_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/promise_util.h"
|
|
|
|
using content::TracingController;
|
|
|
|
namespace mate {
|
|
|
|
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.
|
|
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::DictionaryValue memory_dump_config;
|
|
if (ConvertFromV8(isolate, val, &memory_dump_config)) {
|
|
*out = base::trace_event::TraceConfig(memory_dump_config);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
};
|
|
|
|
} // namespace mate
|
|
|
|
namespace {
|
|
|
|
using CompletionCallback = base::OnceCallback<void(const base::FilePath&)>;
|
|
|
|
base::Optional<base::FilePath> CreateTemporaryFileOnIO() {
|
|
base::FilePath temp_file_path;
|
|
if (!base::CreateTemporaryFile(&temp_file_path))
|
|
return base::nullopt;
|
|
return base::make_optional(std::move(temp_file_path));
|
|
}
|
|
|
|
void StopTracing(electron::util::Promise promise,
|
|
base::Optional<base::FilePath> file_path) {
|
|
if (file_path) {
|
|
auto endpoint = TracingController::CreateFileEndpoint(
|
|
*file_path,
|
|
base::AdaptCallbackForRepeating(base::BindOnce(
|
|
&electron::util::Promise::ResolvePromise<base::FilePath>,
|
|
std::move(promise), *file_path)));
|
|
TracingController::GetInstance()->StopTracing(endpoint);
|
|
} else {
|
|
promise.RejectWithErrorMessage(
|
|
"Failed to create temporary file for trace data");
|
|
}
|
|
}
|
|
|
|
v8::Local<v8::Promise> StopRecording(mate::Arguments* args) {
|
|
electron::util::Promise promise(args->isolate());
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
base::FilePath path;
|
|
if (args->GetNext(&path) && !path.empty()) {
|
|
StopTracing(std::move(promise), base::make_optional(path));
|
|
} else {
|
|
// use a temporary file.
|
|
base::PostTaskAndReplyWithResult(
|
|
FROM_HERE,
|
|
{base::ThreadPool(), 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) {
|
|
electron::util::Promise promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
// Note: This method always succeeds.
|
|
TracingController::GetInstance()->GetCategories(base::BindOnce(
|
|
electron::util::Promise::ResolvePromise<const std::set<std::string>&>,
|
|
std::move(promise)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
v8::Local<v8::Promise> StartTracing(
|
|
v8::Isolate* isolate,
|
|
const base::trace_event::TraceConfig& trace_config) {
|
|
electron::util::Promise promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (!TracingController::GetInstance()->StartTracing(
|
|
trace_config,
|
|
base::BindOnce(electron::util::Promise::ResolveEmptyPromise,
|
|
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 electron::util::Promise::ResolvedPromise(isolate);
|
|
}
|
|
return handle;
|
|
}
|
|
|
|
void OnTraceBufferUsageAvailable(electron::util::Promise promise,
|
|
float percent_full,
|
|
size_t approximate_count) {
|
|
mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
|
|
dict.Set("percentage", percent_full);
|
|
dict.Set("value", approximate_count);
|
|
|
|
promise.Resolve(dict.GetHandle());
|
|
}
|
|
|
|
v8::Local<v8::Promise> GetTraceBufferUsage(v8::Isolate* isolate) {
|
|
electron::util::Promise 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) {
|
|
mate::Dictionary dict(context->GetIsolate(), exports);
|
|
dict.SetMethod("getCategories", &GetCategories);
|
|
dict.SetMethod("startRecording", &StartTracing);
|
|
dict.SetMethod("stopRecording", &StopRecording);
|
|
dict.SetMethod("getTraceBufferUsage", &GetTraceBufferUsage);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
|