8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
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 <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
176 lines
6.1 KiB
C++
176 lines
6.1 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::DictionaryValue memory_dump_config;
|
|
if (ConvertFromV8(isolate, val, &memory_dump_config)) {
|
|
*out = base::trace_event::TraceConfig(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::AdaptCallbackForRepeating(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 endpoint = TracingController::CreateFileEndpoint(
|
|
*file_path, base::BindRepeating(resolve_or_reject, absl::nullopt));
|
|
if (!TracingController::GetInstance()->StopTracing(endpoint)) {
|
|
resolve_or_reject.Run(absl::make_optional(
|
|
"Failed to stop tracing (was a trace in progress?)"));
|
|
}
|
|
} else {
|
|
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_MODULE_CONTEXT_AWARE(electron_browser_content_tracing, Initialize)
|