![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359
patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420
patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575
patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236
* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461
* 6313744: Migrate views::Background factory methods to ColorVariant |6313744
* 6314545: Remove multiple argument support from base::ToString() |6314545
* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362
* 6308998: Add SettingAccess structured metrics event for DevTools |6308998
* 6295214: Remove redundant state field in per-extension preferences |6295214
NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
144 lines
5 KiB
C++
144 lines
5 KiB
C++
// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE-CHROMIUM file.
|
|
|
|
#include "shell/browser/ui/devtools_manager_delegate.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "base/command_line.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/functional/bind.h"
|
|
#include "base/path_service.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/devtools_agent_host.h"
|
|
#include "content/public/browser/devtools_frontend_host.h"
|
|
#include "content/public/browser/devtools_socket_factory.h"
|
|
#include "content/public/browser/favicon_status.h"
|
|
#include "content/public/browser/navigation_entry.h"
|
|
#include "content/public/common/content_switches.h"
|
|
#include "content/public/common/url_constants.h"
|
|
#include "electron/grit/electron_resources.h"
|
|
#include "net/base/net_errors.h"
|
|
#include "net/socket/stream_socket.h"
|
|
#include "net/socket/tcp_server_socket.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/common/electron_paths.h"
|
|
#include "third_party/inspector_protocol/crdtp/dispatch.h"
|
|
#include "ui/base/resource/resource_bundle.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
class TCPServerSocketFactory : public content::DevToolsSocketFactory {
|
|
public:
|
|
TCPServerSocketFactory(const std::string& address, int port)
|
|
: address_(address), port_(port) {}
|
|
|
|
// disable copy
|
|
TCPServerSocketFactory(const TCPServerSocketFactory&) = delete;
|
|
TCPServerSocketFactory& operator=(const TCPServerSocketFactory&) = delete;
|
|
|
|
private:
|
|
// content::ServerSocketFactory.
|
|
std::unique_ptr<net::ServerSocket> CreateForHttpServer() override {
|
|
auto socket =
|
|
std::make_unique<net::TCPServerSocket>(nullptr, net::NetLogSource());
|
|
if (socket->ListenWithAddressAndPort(address_, port_, 10) != net::OK)
|
|
return {};
|
|
|
|
return socket;
|
|
}
|
|
std::unique_ptr<net::ServerSocket> CreateForTethering(
|
|
std::string* name) override {
|
|
return {};
|
|
}
|
|
|
|
std::string address_;
|
|
uint16_t port_;
|
|
};
|
|
|
|
std::unique_ptr<content::DevToolsSocketFactory> CreateSocketFactory() {
|
|
auto& command_line = *base::CommandLine::ForCurrentProcess();
|
|
// See if the user specified a port on the command line (useful for
|
|
// automation). If not, use an ephemeral port by specifying 0.
|
|
int port = 0;
|
|
if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {
|
|
int temp_port;
|
|
std::string port_str =
|
|
command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
|
|
if (base::StringToInt(port_str, &temp_port) && temp_port >= 0 &&
|
|
temp_port < 65535) {
|
|
port = temp_port;
|
|
} else {
|
|
DLOG(WARNING) << "Invalid http debugger port number " << temp_port;
|
|
}
|
|
}
|
|
return std::make_unique<TCPServerSocketFactory>("127.0.0.1", port);
|
|
}
|
|
|
|
const char kBrowserCloseMethod[] = "Browser.close";
|
|
|
|
} // namespace
|
|
|
|
// DevToolsManagerDelegate ---------------------------------------------------
|
|
|
|
// static
|
|
void DevToolsManagerDelegate::StartHttpHandler() {
|
|
base::FilePath session_data;
|
|
base::PathService::Get(DIR_SESSION_DATA, &session_data);
|
|
content::DevToolsAgentHost::StartRemoteDebuggingServer(
|
|
CreateSocketFactory(), session_data, base::FilePath());
|
|
}
|
|
|
|
DevToolsManagerDelegate::DevToolsManagerDelegate() = default;
|
|
|
|
DevToolsManagerDelegate::~DevToolsManagerDelegate() = default;
|
|
|
|
void DevToolsManagerDelegate::Inspect(content::DevToolsAgentHost* agent_host) {}
|
|
|
|
void DevToolsManagerDelegate::HandleCommand(
|
|
content::DevToolsAgentHostClientChannel* channel,
|
|
base::span<const uint8_t> message,
|
|
NotHandledCallback callback) {
|
|
crdtp::Dispatchable dispatchable(crdtp::SpanFrom(message));
|
|
DCHECK(dispatchable.ok());
|
|
if (crdtp::SpanEquals(crdtp::SpanFrom(kBrowserCloseMethod),
|
|
dispatchable.Method())) {
|
|
// In theory, we should respond over the protocol saying that the
|
|
// Browser.close was handled. But doing so requires instantiating the
|
|
// protocol UberDispatcher and generating proper protocol handlers.
|
|
// Since we only have one method and it is supposed to close Electron,
|
|
// we don't need to add this complexity. Should we decide to support
|
|
// methods like Browser.setWindowBounds, we'll need to do it though.
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE, base::BindOnce([]() { Browser::Get()->Quit(); }));
|
|
return;
|
|
}
|
|
std::move(callback).Run(message);
|
|
}
|
|
|
|
scoped_refptr<content::DevToolsAgentHost>
|
|
DevToolsManagerDelegate::CreateNewTarget(const GURL& url,
|
|
TargetType target_type) {
|
|
return nullptr;
|
|
}
|
|
|
|
std::string DevToolsManagerDelegate::GetDiscoveryPageHTML() {
|
|
return ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
|
|
IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE);
|
|
}
|
|
|
|
bool DevToolsManagerDelegate::HasBundledFrontendResources() {
|
|
return true;
|
|
}
|
|
|
|
content::BrowserContext* DevToolsManagerDelegate::GetDefaultBrowserContext() {
|
|
return ElectronBrowserContext::From("", false);
|
|
}
|
|
|
|
} // namespace electron
|