* chore: bump chromium in DEPS to 146.0.7653.0
* chore: bump chromium in DEPS to 146.0.7653.1
* chore: bump chromium in DEPS to 146.0.7655.0
* chore: bump chromium in DEPS to 146.0.7657.1
* chore: bump chromium in DEPS to 146.0.7659.0
* chore: bump chromium in DEPS to 146.0.7661.0
* chore: bump chromium in DEPS to 146.0.7663.1
* chore: bump chromium in DEPS to 146.0.7665.1
* chore: bump chromium in DEPS to 146.0.7667.1
* chore: bump chromium in DEPS to 146.0.7668.2
* chore: bump chromium in DEPS to 146.0.7670.0
* chore: bump chromium in DEPS to 146.0.7672.1
* chore: bump chromium in DEPS to 146.0.7674.1
* chore: bump chromium in DEPS to 146.0.7676.1
* chore: bump chromium in DEPS to 146.0.7678.1
* chore: bump chromium in DEPS to 146.0.7680.1
* chore: bump chromium in DEPS to 146.0.7680.4
* chore: bump chromium in DEPS to 146.0.7680.0
* chore: bump chromium to 146.0.7666.0 (main) (#49528)
* 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 in 773054ad59
* 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 commit 05c43e4e5d2e0017275d6399818cd8e8254f29a0.
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>
(cherry picked from commit a65cfed500)
* chore: update patches after rebase
---------
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>
Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
208 lines
6.5 KiB
C++
208 lines
6.5 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/api/electron_api_debugger.h"
|
|
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include "base/containers/span.h"
|
|
#include "base/json/json_reader.h"
|
|
#include "base/json/json_writer.h"
|
|
#include "content/public/browser/devtools_agent_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "gin/object_template_builder.h"
|
|
#include "gin/per_isolate_data.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/value_converter.h"
|
|
#include "shell/common/gin_helper/handle.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "v8/include/cppgc/allocation.h"
|
|
#include "v8/include/v8-cppgc.h"
|
|
|
|
using content::DevToolsAgentHost;
|
|
|
|
namespace electron::api {
|
|
|
|
gin::WrapperInfo Debugger::kWrapperInfo = {{gin::kEmbedderNativeGin},
|
|
gin::kElectronDebugger};
|
|
|
|
Debugger::Debugger(content::WebContents* web_contents)
|
|
: content::WebContentsObserver{web_contents}, web_contents_{web_contents} {}
|
|
|
|
Debugger::~Debugger() = default;
|
|
|
|
void Debugger::AgentHostClosed(DevToolsAgentHost* agent_host) {
|
|
DCHECK(agent_host == agent_host_);
|
|
agent_host_ = nullptr;
|
|
ClearPendingRequests();
|
|
Emit("detach", "target closed");
|
|
}
|
|
|
|
void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
|
|
base::span<const uint8_t> message) {
|
|
DCHECK(agent_host == agent_host_);
|
|
|
|
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
|
|
v8::HandleScope handle_scope(isolate);
|
|
|
|
const std::string_view message_str = base::as_string_view(message);
|
|
std::optional<base::Value> parsed_message = base::JSONReader::Read(
|
|
message_str, base::JSON_REPLACE_INVALID_CHARACTERS);
|
|
if (!parsed_message || !parsed_message->is_dict())
|
|
return;
|
|
base::DictValue& dict = parsed_message->GetDict();
|
|
std::optional<int> id = dict.FindInt("id");
|
|
if (!id) {
|
|
std::string* method = dict.FindString("method");
|
|
if (!method)
|
|
return;
|
|
std::string* session_id = dict.FindString("sessionId");
|
|
base::DictValue* params = dict.FindDict("params");
|
|
Emit("message", *method, params ? std::move(*params) : base::DictValue(),
|
|
session_id ? *session_id : "");
|
|
} else {
|
|
auto it = pending_requests_.find(*id);
|
|
if (it == pending_requests_.end())
|
|
return;
|
|
|
|
gin_helper::Promise<base::DictValue> promise = std::move(it->second);
|
|
pending_requests_.erase(it);
|
|
|
|
base::DictValue* error = dict.FindDict("error");
|
|
if (error) {
|
|
std::string* error_message = error->FindString("message");
|
|
promise.RejectWithErrorMessage(error_message ? *error_message : "");
|
|
} else {
|
|
base::DictValue* result = dict.FindDict("result");
|
|
promise.Resolve(result ? std::move(*result) : base::DictValue());
|
|
}
|
|
}
|
|
}
|
|
|
|
void Debugger::RenderFrameHostChanged(content::RenderFrameHost* old_rfh,
|
|
content::RenderFrameHost* new_rfh) {
|
|
// ConnectWebContents uses the primary main frame of the webContents,
|
|
// so if the new_rfh is not the primary main frame, we don't want to
|
|
// reconnect otherwise we'll end up trying to reconnect to a RenderFrameHost
|
|
// that already has a DevToolsAgentHost associated with it.
|
|
if (agent_host_ && new_rfh->IsInPrimaryMainFrame()) {
|
|
agent_host_->DisconnectWebContents();
|
|
auto* web_contents = content::WebContents::FromRenderFrameHost(new_rfh);
|
|
agent_host_->ConnectWebContents(web_contents);
|
|
}
|
|
}
|
|
|
|
void Debugger::Attach(gin::Arguments* args) {
|
|
std::string protocol_version;
|
|
args->GetNext(&protocol_version);
|
|
|
|
if (agent_host_) {
|
|
args->ThrowTypeError("Debugger is already attached to the target");
|
|
return;
|
|
}
|
|
|
|
if (!protocol_version.empty() &&
|
|
!DevToolsAgentHost::IsSupportedProtocolVersion(protocol_version)) {
|
|
args->ThrowTypeError("Requested protocol version is not supported");
|
|
return;
|
|
}
|
|
|
|
agent_host_ = DevToolsAgentHost::GetOrCreateFor(web_contents_);
|
|
if (!agent_host_) {
|
|
args->ThrowTypeError("No target available");
|
|
return;
|
|
}
|
|
|
|
agent_host_->AttachClient(this);
|
|
}
|
|
|
|
bool Debugger::IsAttached() {
|
|
return agent_host_ && agent_host_->IsAttached();
|
|
}
|
|
|
|
void Debugger::Detach() {
|
|
if (!agent_host_)
|
|
return;
|
|
agent_host_->DetachClient(this);
|
|
AgentHostClosed(agent_host_.get());
|
|
}
|
|
|
|
v8::Local<v8::Promise> Debugger::SendCommand(gin::Arguments* args) {
|
|
v8::Isolate* isolate = args->isolate();
|
|
gin_helper::Promise<base::DictValue> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
if (!agent_host_) {
|
|
promise.RejectWithErrorMessage("No target available");
|
|
return handle;
|
|
}
|
|
|
|
std::string method;
|
|
if (!args->GetNext(&method)) {
|
|
promise.RejectWithErrorMessage("Invalid method");
|
|
return handle;
|
|
}
|
|
|
|
base::DictValue command_params;
|
|
args->GetNext(&command_params);
|
|
|
|
std::string session_id;
|
|
if (args->GetNext(&session_id) && session_id.empty()) {
|
|
promise.RejectWithErrorMessage("Empty session id is not allowed");
|
|
return handle;
|
|
}
|
|
|
|
base::DictValue request;
|
|
int request_id = ++previous_request_id_;
|
|
pending_requests_.emplace(request_id, std::move(promise));
|
|
request.Set("id", request_id);
|
|
request.Set("method", method);
|
|
if (!command_params.empty()) {
|
|
request.Set("params", std::move(command_params));
|
|
}
|
|
|
|
if (!session_id.empty()) {
|
|
request.Set("sessionId", session_id);
|
|
}
|
|
|
|
const auto json_args = base::WriteJson(request).value_or("");
|
|
agent_host_->DispatchProtocolMessage(this, base::as_byte_span(json_args));
|
|
|
|
return handle;
|
|
}
|
|
|
|
void Debugger::ClearPendingRequests() {
|
|
for (auto& it : pending_requests_)
|
|
it.second.RejectWithErrorMessage("target closed while handling command");
|
|
pending_requests_.clear();
|
|
}
|
|
|
|
// static
|
|
Debugger* Debugger::Create(v8::Isolate* isolate,
|
|
content::WebContents* web_contents) {
|
|
return cppgc::MakeGarbageCollected<Debugger>(
|
|
isolate->GetCppHeap()->GetAllocationHandle(), web_contents);
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder Debugger::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<Debugger>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("attach", &Debugger::Attach)
|
|
.SetMethod("isAttached", &Debugger::IsAttached)
|
|
.SetMethod("detach", &Debugger::Detach)
|
|
.SetMethod("sendCommand", &Debugger::SendCommand);
|
|
}
|
|
|
|
const gin::WrapperInfo* Debugger::wrapper_info() const {
|
|
return &kWrapperInfo;
|
|
}
|
|
|
|
const char* Debugger::GetHumanReadableName() const {
|
|
return "Electron / Debugger";
|
|
}
|
|
|
|
} // namespace electron::api
|