diff options
Diffstat (limited to 'www/chromium/files/patch-ui_views_controls_textfield_textfield.cc')
| -rw-r--r-- | www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc index 0d3ef96600cf..28048e78623a 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2021-05-12 22:06:47 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-07-19 18:45:44 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -72,7 +72,7 @@ +@@ -74,7 +74,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -169,7 +169,7 @@ bool IsControlKeyModifier(int flags) { +@@ -171,7 +171,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 @@ -18,16 +18,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) - RequestFocusWithPointer(ui::EventPointerType::kMouse); - #endif -@@ -727,7 +727,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -731,7 +731,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -36,7 +27,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -883,7 +883,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -877,7 +877,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -45,7 +36,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2258,14 +2258,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2252,14 +2252,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -62,12 +53,3 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -2357,7 +2357,7 @@ bool Textfield::PasteSelectionClipboard() { - void Textfield::UpdateSelectionClipboard() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) - if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) - .WriteText(GetSelectedText()); |