chore: bump chromium to 142.0.7417.0 (main) (#48275)

* chore: bump chromium in DEPS to 142.0.7401.0 * 6911185: Reland "Send touch moves async immediately after scroll starts." https://chromium-review.googlesource.com/c/chromium/src/+/6911185 * 6906887: mac: click through content area in main window https://chromium-review.googlesource.com/c/chromium/src/+/6906887 * 6916667: Expose helper to eliminate duplicate recipes. https://chromium-review.googlesource.com/c/chromium/src/+/6916667 * 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h. https://chromium-review.googlesource.com/c/chromium/src/+/6909842 * 6884056: Remove the SecKeychain implementation for the Keychain interface https://chromium-review.googlesource.com/c/chromium/src/+/6884056 * 6904906: Remove `WTF::` in renderer/core/[p-x].*/ https://chromium-review.googlesource.com/c/chromium/src/+/6904906 * 6556585: [persistent_cache]: PersistentCache for CodeCache https://chromium-review.googlesource.com/c/chromium/src/+/6556585 * 6904864: Layout: Support abort on the text placeholder layout https://chromium-review.googlesource.com/c/chromium/src/+/6904864 * chore: fixup patch indices * chore: bump chromium in DEPS to 142.0.7402.0 * fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache * chore: fixup patch indices * 6905244: [api] Remove deprecated `GetIsolate` https://chromium-review.googlesource.com/c/v8/v8/+/6905244 * 6897694: Remove NativeTheme::UserHasContrastPreference(). https://chromium-review.googlesource.com/c/chromium/src/+/6897694 * 6897477: Remove GetPlatformHighContrastColorScheme() and enum. https://chromium-review.googlesource.com/c/chromium/src/+/6897477 * 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()" https://chromium-review.googlesource.com/c/chromium/src/+/6918198 * 6907147: [LNA] add use counter for websocket mixed-content issues https://chromium-review.googlesource.com/c/chromium/src/+/6907147 * 6914538: Replace WTF::String with blink::String https://chromium-review.googlesource.com/c/website/+/6914538 * 6892538: [video pip] Allow touchscreen users to toggle live caption https://chromium-review.googlesource.com/c/chromium/src/+/6892538 * chore: fix patch * chore: bump chromium in DEPS to 142.0.7403.0 * build: remove ninja logs * chore: fixup patch indices * 6920670: [PDF] Change pdf_extension_util to return dictionaries https://chromium-review.googlesource.com/c/chromium/src/+/6920670 * 6917864: Devirtualize and inline various NativeTheme getters. https://chromium-review.googlesource.com/c/chromium/src/+/6917864 * 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL() https://chromium-review.googlesource.com/c/chromium/src/+/6920873 * build: don't kill blink/web_tests * 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions) https://chromium-review.googlesource.com/c/chromium/src/+/6923655 * 6905242: Reland "[CSP] Clarify report-only console messages." https://chromium-review.googlesource.com/c/chromium/src/+/6905242 * fixup! 6897694: Remove NativeTheme::UserHasContrastPreference(). * chore: bump chromium in DEPS to 142.0.7405.0 * 6910012: [LNA] Enable LNA enforcement by default https://chromium-review.googlesource.com/c/chromium/src/+/6910012 * 6929444: Combine GetInstanceForXXX() implementations. https://chromium-review.googlesource.com/c/chromium/src/+/6929444 * 6927873: Rename native_widget_types.h -> native_ui_types.h https://chromium-review.googlesource.com/c/chromium/src/+/6927873 * 6853978: Init perfetto really early in WebView https://chromium-review.googlesource.com/c/chromium/src/+/6853978 * 6874886: Use only one picker observer to avoid getting duplicate notifications https://chromium-review.googlesource.com/c/chromium/src/+/6874886 * chore: fixup patch indices * fix: Protocol complex inline dtor * chore: bump chromium in DEPS to 142.0.7407.0 * chore: bump chromium in DEPS to 142.0.7409.0 * chore: bump chromium in DEPS to 142.0.7411.0 * chore: bump chromium in DEPS to 142.0.7413.0 * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." * 6927233: Remove NativeTheme "use dark colors" bit. https://chromium-review.googlesource.com/c/chromium/src/+/6927233 * chore: fixup patch indices * 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes https://chromium-review.googlesource.com/c/chromium/src/+/6899206 * chore: bump chromium in DEPS to 142.0.7415.0 * 6936895: [headless] Remove headless flag from views::Widget class https://chromium-review.googlesource.com/c/chromium/src/+/6936895 We should probably followup on this to see if there is a way to do this without reverting this CL. * 6937023: Reland "Use new DBus type system in dbus_xdg::Request" https://chromium-review.googlesource.com/c/chromium/src/+/6937023 * chore: update patches * 6944749: Add GN visibility list to //components/os_crypt/sync https://chromium-review.googlesource.com/c/chromium/src/+/6944749 * Further replace sub_capture_target_version with CaptureVersion https://chromium-review.googlesource.com/c/chromium/src/+/6935455 * fixup for lint * chore: update filenames.libcxx.gni * chore: bump chromium in DEPS to 142.0.7417.0 * 6944136: Reorder NativeTheme headers/.cc files. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136 * 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701 * 6944404: Remove extraneous callback call Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404 * 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124 * chore: update patches * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 * fixup! 6917864: Devirtualize and inline various NativeTheme getters. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864 * 6937588: Add initial OsSettingsProvider object, supplying caret blink interval. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588 * fixup! 6905242: Reland "[CSP] Clarify report-only console messages." Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242 * 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515 * 6910482: [Save to Drive] Implement retry functionality Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482 * fixup! 6927233: Remove NativeTheme "use dark colors" bit. Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233 * Revert "build: remove ninja logs" This reverts commit 72874740fd. * test: fix flakey test picked from PR 48205 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
2026-04-10 03:01:51 -04:00 · 2025-09-22 20:16:27 -07:00
parent 19256a07dd
commit 1fda08b8c8
128 changed files with 1849 additions and 867 deletions
--- a/shell/browser/api/electron_api_menu_views.cc
+++ b/shell/browser/api/electron_api_menu_views.cc
@@ -34,7 +34,7 @@ void MenuViews::PopupAt(BaseWindow* window,
  // (-1, -1) means showing on mouse location.
  gfx::Point location;
  if (x == -1 || y == -1) {
-    location = display::Screen::GetScreen()->GetCursorScreenPoint();
+    location = display::Screen::Get()->GetCursorScreenPoint();
  } else {
    gfx::Point origin = native_window->GetContentBounds().origin();
    location = gfx::Point(origin.x() + x, origin.y() + y);
--- a/shell/browser/api/electron_api_native_theme.cc
+++ b/shell/browser/api/electron_api_native_theme.cc
@@ -73,11 +73,18 @@ ui::NativeTheme::ThemeSource NativeTheme::GetThemeSource() const {
 }

 bool NativeTheme::ShouldUseDarkColors() {
-  return ui_theme_->ShouldUseDarkColors();
+  auto theme_source = GetThemeSource();
+  if (theme_source == ui::NativeTheme::ThemeSource::kForcedLight)
+    return false;
+  if (theme_source == ui::NativeTheme::ThemeSource::kForcedDark)
+    return true;
+  return ui_theme_->preferred_color_scheme() ==
+         ui::NativeTheme::PreferredColorScheme::kDark;
 }

 bool NativeTheme::ShouldUseHighContrastColors() {
-  return ui_theme_->UserHasContrastPreference();
+  return ui_theme_->preferred_contrast() ==
+         ui::NativeTheme::PreferredContrast::kMore;
 }

 bool NativeTheme::ShouldUseDarkColorsForSystemIntegratedUI() {
@@ -86,11 +93,11 @@ bool NativeTheme::ShouldUseDarkColorsForSystemIntegratedUI() {
 }

 bool NativeTheme::InForcedColorsMode() {
-  return ui_theme_->InForcedColorsMode();
+  return ui_theme_->forced_colors();
 }

 bool NativeTheme::GetPrefersReducedTransparency() {
-  return ui_theme_->GetPrefersReducedTransparency();
+  return ui_theme_->prefers_reduced_transparency();
 }

 #if BUILDFLAG(IS_MAC)
@@ -109,8 +116,9 @@ bool NativeTheme::ShouldUseInvertedColorScheme() {
    return false;
  return is_inverted;
 #else
-  return ui_theme_->GetPlatformHighContrastColorScheme() ==
-         ui::NativeTheme::PlatformHighContrastColorScheme::kDark;
+  return ui_theme_->forced_colors() &&
+         ui_theme_->preferred_color_scheme() ==
+             ui::NativeTheme::PreferredColorScheme::kDark;
 #endif
 }

--- a/shell/browser/api/electron_api_protocol.cc
+++ b/shell/browser/api/electron_api_protocol.cc
@@ -198,6 +198,8 @@ const char* const kBuiltinSchemes[] = {
 Protocol::Protocol(ProtocolRegistry* protocol_registry)
    : protocol_registry_{protocol_registry} {}

+Protocol::~Protocol() = default;
+
 // Convert error code to string.
 // static
 std::string_view Protocol::ErrorCodeToString(Error error) {
--- a/shell/browser/api/electron_api_protocol.h
+++ b/shell/browser/api/electron_api_protocol.h
@@ -71,7 +71,7 @@ class Protocol final : public gin_helper::DeprecatedWrappable<Protocol>,
      base::RepeatingCallback<void(v8::Local<v8::Value>)>;

  explicit Protocol(ProtocolRegistry* protocol_registry);
-  ~Protocol() override = default;
+  ~Protocol() override;

  [[nodiscard]] static std::string_view ErrorCodeToString(Error error);

--- a/shell/browser/api/electron_api_screen.cc
+++ b/shell/browser/api/electron_api_screen.cc
@@ -179,7 +179,7 @@ v8::Local<v8::Value> Screen::Create(gin_helper::ErrorThrower error_thrower) {
    return v8::Null(error_thrower.isolate());
  }

-  display::Screen* screen = display::Screen::GetScreen();
+  display::Screen* screen = display::Screen::Get();
  if (!screen) {
    error_thrower.ThrowError("Failed to get screen information");
    return v8::Null(error_thrower.isolate());
--- a/shell/browser/api/electron_api_system_preferences.h
+++ b/shell/browser/api/electron_api_system_preferences.h
@@ -14,9 +14,9 @@
 #include "shell/common/gin_helper/wrappable.h"

 #if BUILDFLAG(IS_WIN)
+#include "base/callback_list.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/browser_observer.h"
-#include "ui/gfx/win/singleton_hwnd_observer.h"
 #endif

 namespace gin_helper {
@@ -65,7 +65,7 @@ class SystemPreferences final
 #if BUILDFLAG(IS_WIN)
  void InitializeWindow();

-  // Called by `singleton_hwnd_observer_`.
+  // Called by `hwnd_subscription_`.
  void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);

  // BrowserObserver:
@@ -160,7 +160,7 @@ class SystemPreferences final
  std::string current_color_;

  // Color/high contrast mode change observer.
-  std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
+  base::CallbackListSubscription hwnd_subscription_;
 #endif
 };

--- a/shell/browser/api/electron_api_system_preferences_win.cc
+++ b/shell/browser/api/electron_api_system_preferences_win.cc
@@ -17,6 +17,7 @@
 #include "shell/common/color_util.h"
 #include "shell/common/process_util.h"
 #include "ui/gfx/win/hwnd_util.h"
+#include "ui/gfx/win/singleton_hwnd.h"

 namespace electron {

@@ -157,8 +158,8 @@ void SystemPreferences::InitializeWindow() {
  // Creating this listener before the app is ready causes global shortcuts
  // to not fire
  if (Browser::Get()->is_ready())
-    singleton_hwnd_observer_ =
-        std::make_unique<gfx::SingletonHwndObserver>(base::BindRepeating(
+    hwnd_subscription_ =
+        gfx::SingletonHwnd::GetInstance()->RegisterCallback(base::BindRepeating(
            &SystemPreferences::OnWndProc, base::Unretained(this)));
  else
    Browser::Get()->AddObserver(this);
@@ -220,8 +221,8 @@ void SystemPreferences::OnWndProc(HWND hwnd,
 }

 void SystemPreferences::OnFinishLaunching(base::Value::Dict launch_info) {
-  singleton_hwnd_observer_ =
-      std::make_unique<gfx::SingletonHwndObserver>(base::BindRepeating(
+  hwnd_subscription_ =
+      gfx::SingletonHwnd::GetInstance()->RegisterCallback(base::BindRepeating(
          &SystemPreferences::OnWndProc, base::Unretained(this)));
 }

--- a/shell/browser/api/electron_api_web_contents.cc
+++ b/shell/browser/api/electron_api_web_contents.cc
@@ -572,8 +572,8 @@ std::optional<base::TimeDelta> GetCursorBlinkInterval() {
  if (system_value)
    return *system_value;
 #elif BUILDFLAG(IS_LINUX)
-  if (auto* linux_ui = ui::LinuxUi::instance())
-    return linux_ui->GetCursorBlinkInterval();
+  if (auto* native_theme = ui::NativeTheme::GetInstanceForNativeUi())
+    return native_theme->caret_blink_interval();
 #elif BUILDFLAG(IS_WIN)
  const auto system_msec = ::GetCaretBlinkTime();
  if (system_msec != 0) {
@@ -3578,7 +3578,7 @@ v8::Local<v8::Promise> WebContents::CapturePage(gin::Arguments* args) {
  // current system, increase the requested bitmap size to capture it all.
  gfx::Size bitmap_size = view_size;
  const gfx::NativeView native_view = view->GetNativeView();
-  const float scale = display::Screen::GetScreen()
+  const float scale = display::Screen::Get()
                          ->GetDisplayNearestView(native_view)
                          .device_scale_factor();
  if (scale > 1.0f)
--- a/shell/browser/api/frame_subscriber.h
+++ b/shell/browser/api/frame_subscriber.h
@@ -61,7 +61,8 @@ class FrameSubscriber : private content::WebContentsObserver,
      const gfx::Rect& content_rect,
      mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
          callbacks) override;
-  void OnNewSubCaptureTargetVersion(uint32_t crop_version) override {}
+  void OnNewCaptureVersion(
+      const media::CaptureVersion& capture_version) override {}
  void OnFrameWithEmptyRegionCapture() override {}
  void OnStopped() override {}
  void OnLog(const std::string& message) override {}