1 files changed, 14 insertions, 0 deletions
diff --git a/chromium/content/app/mac_init.mm b/chromium/content/app/mac_init.mm
index 603c25a1bd4..963f45a8936 100644
--- a/chromium/content/app/mac_init.mm
+++ b/chromium/content/app/mac_init.mm
@@ -6,6 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/mac/mac_util.h"
 #include "content/common/mac/system_policy.h"
 
 namespace content {
@@ -29,6 +30,19 @@ void InitializeMac() {
     @"NSAppSleepDisabled" : @YES,
   }];
 
+  if (base::mac::MacOSVersion() >= 26'00'00) {
+    [NSUserDefaults.standardUserDefaults registerDefaults:@{
+      // Disable NSAutoFillHeuristicController on macOS 26. On macOS 26, the
+      // browser process sends synchronized IPC messages to the renderer process
+      // on pages with <input> tags. At this point, if the renderer process
+      // sends a synchronized IPC message to the browser process, it will cause
+      // a deadlock.
+      // https://crbug.com/446070423
+      // https://crbug.com/446481994
+      @"NSAutoFillHeuristicControllerEnabled" : @NO,
+    }];
+  }
+
   SetSystemPolicyCrashKeys();
 }