chore: bump chromium to 147.0.7687.0 (main) (#49782)

* chore: bump chromium in DEPS to 147.0.7683.0 * fix(patch): constant moved to header Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7536483 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(patch): occlusion simplification upstream Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7563790 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: remove upstreamed patches Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: bump chromium in DEPS to 147.0.7685.0 * fix(patch): V1 Keychain removal Upstream deleted the V1 Keychain API. Removed V1 hunks and adapted keychain_password_mac.mm to use KeychainV2 APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7540447 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7535923: Rename ozone buildflags Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7535923 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7528398: [LNA] Rename PNA-named files to LNA-named files Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528398 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7534194: Convert some functions in ui::Clipboard to async Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7534194 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * 7544580: [DevTools] Add command to restart Chrome to DevTools UI bindings Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7544580 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: bump chromium in DEPS to 147.0.7687.0 * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: incorporate learnings into claude skill I asked Claude to reflect on our upgrade session, consider what it learned and should know in the future, and to update its skill documents. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-19 03:14:51 -05:00 · 2026-02-17 14:25:21 -05:00
parent 0da0c3a47e
commit c98cf69f40
105 changed files with 628 additions and 856 deletions
--- a/shell/browser/api/electron_api_desktop_capturer.cc
+++ b/shell/browser/api/electron_api_desktop_capturer.cc
@@ -33,7 +33,7 @@
 #include "third_party/webrtc/modules/desktop_capture/win/dxgi_duplicator_controller.h"
 #include "third_party/webrtc/modules/desktop_capture/win/screen_capturer_win_directx.h"
 #include "ui/display/win/display_info.h"
-#elif BUILDFLAG(IS_OZONE_X11)
+#elif BUILDFLAG(SUPPORTS_OZONE_X11)
 #include "base/logging.h"
 #include "ui/base/x/x11_display_util.h"
 #include "ui/base/x/x11_util.h"
@@ -461,7 +461,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
    for (auto& source : screen_sources) {
      source.display_id = base::NumberToString(source.media_list_source.id.id);
    }
-#elif BUILDFLAG(IS_OZONE_X11)
+#elif BUILDFLAG(SUPPORTS_OZONE_X11)
    // On Linux, with X11, the source id is the numeric value of the
    // display name atom and the display id is either the EDID or the
    // loop index when that display was found (see
--- a/shell/browser/native_window_views.cc
+++ b/shell/browser/native_window_views.cc
@@ -5,7 +5,7 @@
 // FIXME(ckerr) this incorrect #include order is a temporary
 // fix to unblock the roll. Will fix in an upgrade followup.
 #include "ui/base/ozone_buildflags.h"
-#if BUILDFLAG(IS_OZONE_X11)
+#if BUILDFLAG(SUPPORTS_OZONE_X11)
 #include "ui/base/x/x11_util.h"
 #endif

@@ -65,7 +65,7 @@
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/window/native_frame_view.h"

-#if BUILDFLAG(IS_OZONE_X11)
+#if BUILDFLAG(SUPPORTS_OZONE_X11)
 #include "shell/browser/ui/views/global_menu_bar_x11.h"
 #include "shell/browser/ui/x/event_disabler.h"
 #include "shell/browser/ui/x/x_window_utils.h"
--- a/shell/browser/native_window_views.h
+++ b/shell/browser/native_window_views.h
@@ -36,7 +36,7 @@ class ClientFrameViewLinux;
 class GlobalMenuBarX11;
 #endif

-#if BUILDFLAG(IS_OZONE_X11)
+#if BUILDFLAG(SUPPORTS_OZONE_X11)
 class EventDisabler;
 #endif

@@ -273,7 +273,7 @@ class NativeWindowViews : public NativeWindow,
  std::unique_ptr<GlobalMenuBarX11> global_menu_bar_;
 #endif

-#if BUILDFLAG(IS_OZONE_X11)
+#if BUILDFLAG(SUPPORTS_OZONE_X11)
  // To disable the mouse events.
  std::unique_ptr<EventDisabler> event_disabler_;
 #endif
--- a/shell/browser/net/url_loader_network_observer.h
+++ b/shell/browser/net/url_loader_network_observer.h
@@ -58,7 +58,7 @@ class URLLoaderNetworkObserver
  void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
                       base::ByteSize recv_bytes,
                       base::ByteSize sent_bytes) override {}
-  void OnWebSocketConnectedToPrivateNetwork(
+  void OnWebSocketConnectedToLocalNetwork(
      const GURL& request_url,
      network::mojom::IPAddressSpace ip_address_space) override {}
  void OnCertificateRequested(
@@ -70,7 +70,7 @@ class URLLoaderNetworkObserver
      network::mojom::TransportType transport_type,
      network::mojom::IPAddressSpace ip_address_space,
      OnLocalNetworkAccessPermissionRequiredCallback callback) override {}
-  void OnUrlLoaderConnectedToPrivateNetwork(
+  void OnUrlLoaderConnectedToLocalNetwork(
      const GURL& request_url,
      network::mojom::IPAddressSpace response_address_space,
      network::mojom::IPAddressSpace client_address_space,
--- a/shell/browser/ui/inspectable_web_contents.h
+++ b/shell/browser/ui/inspectable_web_contents.h
@@ -199,6 +199,7 @@ class InspectableWebContents
  void DispatchHttpRequest(
      DispatchCallback callback,
      const DevToolsDispatchHttpRequestParams& params) override {}
+  void RequestRestart() override {}

  // content::DevToolsFrontendHostDelegate:
  void HandleMessageFromDevToolsFrontend(base::DictValue message);
--- a/shell/common/api/electron_api_clipboard.cc
+++ b/shell/common/api/electron_api_clipboard.cc
@@ -75,14 +75,32 @@ std::string Clipboard::Read(const std::string& format_string) {
  }
  // Otherwise, resolve custom format names
  std::map<std::string, std::string> custom_format_names;
-  custom_format_names =
-      clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kCopyPaste,
-                                            /* data_dst = */ nullptr);
+  {
+    base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
+    clipboard->ExtractCustomPlatformNames(
+        ui::ClipboardBuffer::kCopyPaste, /* data_dst = */ std::nullopt,
+        base::BindOnce(
+            [](std::map<std::string, std::string>* out, base::OnceClosure quit,
+               std::map<std::string, std::string> result) {
+              *out = std::move(result);
+              std::move(quit).Run();
+            },
+            &custom_format_names, run_loop.QuitClosure()));
+    run_loop.Run();
+  }
 #if BUILDFLAG(IS_LINUX)
  if (!custom_format_names.contains(format_string)) {
-    custom_format_names =
-        clipboard->ExtractCustomPlatformNames(ui::ClipboardBuffer::kSelection,
-                                              /* data_dst = */ nullptr);
+    base::RunLoop run_loop(base::RunLoop::Type::kNestableTasksAllowed);
+    clipboard->ExtractCustomPlatformNames(
+        ui::ClipboardBuffer::kSelection, /* data_dst = */ std::nullopt,
+        base::BindOnce(
+            [](std::map<std::string, std::string>* out, base::OnceClosure quit,
+               std::map<std::string, std::string> result) {
+              *out = std::move(result);
+              std::move(quit).Run();
+            },
+            &custom_format_names, run_loop.QuitClosure()));
+    run_loop.Run();
  }
 #endif

@@ -243,7 +261,7 @@ gfx::Image Clipboard::ReadImage(gin::Arguments* const args) {
  base::RepeatingClosure callback = run_loop.QuitClosure();
  clipboard->ReadPng(
      GetClipboardBuffer(args),
-      /* data_dst = */ nullptr,
+      /* data_dst = */ std::nullopt,
      base::BindOnce(
          [](std::optional<gfx::Image>* image, base::RepeatingClosure cb,
             const std::vector<uint8_t>& result) {
--- a/shell/common/api/electron_api_url_loader.h
+++ b/shell/common/api/electron_api_url_loader.h
@@ -127,13 +127,13 @@ class SimpleURLLoaderWrapper final
  void OnDataUseUpdate(int32_t network_traffic_annotation_id_hash,
                       base::ByteSize recv_bytes,
                       base::ByteSize sent_bytes) override {}
-  void OnWebSocketConnectedToPrivateNetwork(
+  void OnWebSocketConnectedToLocalNetwork(
      const GURL& request_url,
      network::mojom::IPAddressSpace ip_address_space) override {}
  void Clone(
      mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
          observer) override;
-  void OnUrlLoaderConnectedToPrivateNetwork(
+  void OnUrlLoaderConnectedToLocalNetwork(
      const GURL& request_url,
      network::mojom::IPAddressSpace response_address_space,
      network::mojom::IPAddressSpace client_address_space,