chore: bump chromium to 144.0.7514.0 (main) (#48840)

* chore: bump chromium in DEPS to 144.0.7514.0 * chore: update patches * 7119882: Reorganize //ui/gfx GN build target https://chromium-review.googlesource.com/c/chromium/src/+/7119882 * Replace includes with forward declares in rect_conversions.h https://chromium-review.googlesource.com/c/chromium/src/+/7127098 * Add ssl info to TrustedHeaderClient https://chromium-review.googlesource.com/c/chromium/src/+/7106780 * Replace ContentPluginInfo with WebPluginInfo https://chromium-review.googlesource.com/c/chromium/src/+/7127893 * Reland "[temporal] Unflag Temporal" https://chromium-review.googlesource.com/c/v8/v8/+/7123876 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
2026-01-08 23:18:06 -05:00 · 2025-11-10 13:27:35 +01:00
parent 068ac3c405
commit a22511a196
34 changed files with 111 additions and 86 deletions
--- a/shell/app/electron_content_client.cc
+++ b/shell/app/electron_content_client.cc
@@ -13,7 +13,6 @@
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "content/public/common/buildflags.h"
-#include "content/public/common/content_constants.h"
 #include "electron/buildflags/buildflags.h"
 #include "electron/fuses.h"
 #include "extensions/common/constants.h"
@@ -37,7 +36,7 @@
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)

 #if BUILDFLAG(ENABLE_PLUGINS)
-#include "content/public/common/content_plugin_info.h"
+#include "content/public/common/webplugininfo.h"
 #endif  // BUILDFLAG(ENABLE_PLUGINS)

 namespace electron {
@@ -162,21 +161,25 @@ void ElectronContentClient::AddAdditionalSchemes(Schemes* schemes) {
 }

 void ElectronContentClient::AddPlugins(
-    std::vector<content::ContentPluginInfo>* plugins) {
+    std::vector<content::WebPluginInfo>* plugins) {
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
+  static constexpr char16_t kPDFPluginName[] = u"Chromium PDF Plugin";
+  static constexpr char16_t kPDFPluginDescription[] = u"Built-in PDF viewer";
  static constexpr char kPDFPluginExtension[] = "pdf";
-  static constexpr char kPDFPluginDescription[] = "Portable Document Format";
+  static constexpr char kPDFPluginExtensionDescription[] =
+      "Portable Document Format";

-  content::ContentPluginInfo pdf_info;
-  pdf_info.is_internal = true;
-  pdf_info.name = kPDFInternalPluginName;
-  pdf_info.description = kPDFPluginDescription;
+  content::WebPluginInfo pdf_info;
+  pdf_info.name = kPDFPluginName;
  // This isn't a real file path; it's just used as a unique identifier.
  static constexpr std::string_view kPdfPluginPath = "internal-pdf-viewer";
  pdf_info.path = base::FilePath::FromASCII(kPdfPluginPath);
-  content::WebPluginMimeType pdf_mime_type(
-      pdf::kInternalPluginMimeType, kPDFPluginExtension, kPDFPluginDescription);
+  pdf_info.desc = kPDFPluginDescription;
+  content::WebPluginMimeType pdf_mime_type(pdf::kInternalPluginMimeType,
+                                           kPDFPluginExtension,
+                                           kPDFPluginExtensionDescription);
  pdf_info.mime_types.push_back(pdf_mime_type);
+  pdf_info.type = content::WebPluginInfo::PLUGIN_TYPE_BROWSER_INTERNAL_PLUGIN;
  plugins->push_back(pdf_info);
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 }
--- a/shell/app/electron_content_client.h
+++ b/shell/app/electron_content_client.h
@@ -29,7 +29,7 @@ class ElectronContentClient : public content::ContentClient {
  gfx::Image& GetNativeImageNamed(int resource_id) override;
  base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
  void AddAdditionalSchemes(Schemes* schemes) override;
-  void AddPlugins(std::vector<content::ContentPluginInfo>* plugins) override;
+  void AddPlugins(std::vector<content::WebPluginInfo>* plugins) override;
  void AddContentDecryptionModules(
      std::vector<content::CdmInfo>* cdms,
      std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
--- a/shell/browser/net/proxying_url_loader_factory.cc
+++ b/shell/browser/net/proxying_url_loader_factory.cc
@@ -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());
--- a/shell/browser/net/proxying_url_loader_factory.h
+++ b/shell/browser/net/proxying_url_loader_factory.h
@@ -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:
--- a/shell/browser/net/proxying_websocket.cc
+++ b/shell/browser/net/proxying_websocket.cc
@@ -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);
--- a/shell/browser/net/proxying_websocket.h
+++ b/shell/browser/net/proxying_websocket.h
@@ -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(
--- a/shell/common/electron_constants.h
+++ b/shell/common/electron_constants.h
@@ -33,8 +33,6 @@ inline constexpr char kElectronGlobalShortcutsUuid[] =
 #if BUILDFLAG(ENABLE_PDF_VIEWER)
 inline constexpr std::string_view kPDFExtensionPluginName =
    "Chromium PDF Viewer";
-inline constexpr std::string_view kPDFInternalPluginName =
-    "Chromium PDF Plugin";
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)

 }  // namespace electron
--- a/shell/common/gin_converters/gfx_converter.cc
+++ b/shell/common/gin_converters/gfx_converter.cc
@@ -16,6 +16,7 @@
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
+#include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/resize_utils.h"
 #include "ui/gfx/geometry/size.h"

--- a/shell/common/plugin_info.h
+++ b/shell/common/plugin_info.h
@@ -7,7 +7,7 @@

 #include <vector>

-#include "content/public/common/content_plugin_info.h"
+#include "content/public/common/webplugininfo.h"
 #include "electron/buildflags/buildflags.h"

 namespace electron {