diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
| commit | a0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch) | |
| tree | 0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | |
| parent | games/iqpuzzle: Update 1.2.0 -> 1.2.1 (diff) | |
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene
Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
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 | 32 |
1 files changed, 16 insertions, 16 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 f1c334eff63a..62bc835c01ea 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,41 +1,41 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2020-09-08 19:14:28 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-11-13 06:37:06 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ #include "base/win/win_util.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "ui/base/ime/linux/text_edit_command_auralinux.h" // nogncheck - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" // nogncheck + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -185,14 +185,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -192,14 +192,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke #endif return ui::TextEditCommand::DELETE_BACKWARD; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -260,7 +260,7 @@ bool IsControlKeyModifier(int flags) { +@@ -267,7 +267,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 defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -717,7 +717,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -758,7 +758,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::kMouse); #endif -@@ -763,7 +763,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -805,7 +805,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -915,7 +915,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -957,7 +957,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +62,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2202,7 +2202,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2241,7 +2241,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { |