github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 144.0.7514.0 (40-x-y) (#48868)

Browse Source 
* chore: bump chromium in DEPS to 144.0.7514.0

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>

* chore: update patches

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* 7119882: Reorganize //ui/gfx GN build target

https://chromium-review.googlesource.com/c/chromium/src/+/7119882

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* Replace includes with forward declares in rect_conversions.h

https://chromium-review.googlesource.com/c/chromium/src/+/7127098

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* Add ssl info to TrustedHeaderClient

https://chromium-review.googlesource.com/c/chromium/src/+/7106780

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* Replace ContentPluginInfo with WebPluginInfo

https://chromium-review.googlesource.com/c/chromium/src/+/7127893

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* Reland "[temporal] Unflag Temporal"

https://chromium-review.googlesource.com/c/v8/v8/+/7123876

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* chore: update .patches after trop

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
trop[bot]
2025-11-10 18:32:34 +01:00
committed by GitHub
parent ec84ba6b6c
commit 6876eb2fe9
34 changed files with 111 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
shell/browser/net/proxying_url_loader_factory.cc
View File

@@ -343,6 +343,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnBeforeSendHeaders(
void ProxyingURLLoaderFactory::InProgressRequest::OnHeadersReceived(
const std::string& headers,
const net::IPEndPoint& remote_endpoint,
const std::optional<net::SSLInfo>& ssl_info,
OnHeadersReceivedCallback callback) {
if (!current_request_uses_header_client_) {
std::move(callback).Run(net::OK, std::nullopt, GURL());

2
shell/browser/net/proxying_url_loader_factory.h
View File

@@ -23,6 +23,7 @@
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/base/completion_once_callback.h"
#include "net/ssl/ssl_info.h"
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/mojom/network_context.mojom.h"
@@ -115,6 +116,7 @@ class ProxyingURLLoaderFactory
OnBeforeSendHeadersCallback callback) override;
void OnHeadersReceived(const std::string& headers,
const net::IPEndPoint& endpoint,
const std::optional<net::SSLInfo>& ssl_info,
OnHeadersReceivedCallback callback) override;
private:

8
shell/browser/net/proxying_websocket.cc
View File

@@ -207,9 +207,11 @@ void ProxyingWebSocket::OnBeforeSendHeaders(
OnBeforeRequestComplete(net::OK);
}
void ProxyingWebSocket::OnHeadersReceived(const std::string& headers,
const net::IPEndPoint& endpoint,
OnHeadersReceivedCallback callback) {
void ProxyingWebSocket::OnHeadersReceived(
const std::string& headers,
const net::IPEndPoint& endpoint,
const std::optional<net::SSLInfo>& ssl_info,
OnHeadersReceivedCallback callback) {
DCHECK(receiver_as_header_client_.is_bound());
on_headers_received_callback_ = std::move(callback);

2
shell/browser/net/proxying_websocket.h
View File

@@ -16,6 +16,7 @@
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "net/ssl/ssl_info.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/mojom/network_context.mojom.h"
#include "services/network/public/mojom/websocket.mojom.h"
@@ -94,6 +95,7 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
OnBeforeSendHeadersCallback callback) override;
void OnHeadersReceived(const std::string& headers,
const net::IPEndPoint& endpoint,
const std::optional<net::SSLInfo>& ssl_info,
OnHeadersReceivedCallback callback) override;
static void StartProxying(