Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 65 deletions

diff --git a/devel/electron35/files/patch-ui_views_controls_textfield_textfield.cc b/devel/electron35/files/patch-ui_views_controls_textfield_textfield.cc
deleted file mode 100644
index c4a72ec57ffb..000000000000
--- a/devel/electron35/files/patch-ui_views_controls_textfield_textfield.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- ui/views/controls/textfield/textfield.cc.orig	2025-03-24 20:50:14 UTC
-+++ ui/views/controls/textfield/textfield.cc
-@@ -85,7 +85,7 @@
- #include "base/win/win_util.h"
- #endif
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/base/ime/linux/text_edit_command_auralinux.h"
- #include "ui/base/ime/text_input_flags.h"
- #include "ui/linux/linux_ui.h"
-@@ -182,7 +182,7 @@ bool IsControlKeyModifier(int flags) {
- // Control-modified key combination, but we cannot extend it to other platforms
- // as Control has different meanings and behaviors.
- // https://crrev.com/2580483002/#msg46
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-   return flags & ui::EF_CONTROL_DOWN;
- #else
-   return false;
-@@ -789,7 +789,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
-     return handled;
-   }
- 
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-   if (!handled && linux_ui &&
-@@ -974,7 +974,7 @@ bool Textfield::SkipDefaultKeyEventProcessing(const ui
- }
- 
- bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
-   // Skip any accelerator handling that conflicts with custom keybindings.
-   auto* linux_ui = ui::LinuxUi::instance();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -2065,7 +2065,7 @@ bool Textfield::ShouldDoLearning() {
-   return false;
- }
- 
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // TODO(crbug.com/41452689): Implement this method to support Korean IME
- // reconversion feature on native text fields (e.g. find bar).
- bool Textfield::SetCompositionFromExistingText(
-@@ -2583,7 +2583,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
- #endif
-         return ui::TextEditCommand::DELETE_BACKWARD;
-       }
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift) {
-         return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE;
-@@ -2591,7 +2591,7 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
- #endif
-       return ui::TextEditCommand::DELETE_WORD_BACKWARD;
-     case ui::VKEY_DELETE:
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift && control) {
-         return ui::TextEditCommand::DELETE_TO_END_OF_LINE;