diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 10:40:01 +0200 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-04-06 10:46:52 +0200 |
commit | 1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch) | |
tree | 551daaabc2287f94c3b2d7b59c0cc2a235156540 /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | |
parent | Document new vulnerabilities in www/chromium < 89.0.4389.114 (diff) |
www/chromium: update to 89.0.4389.114
Submitted by: Matthias Wolf via github
Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-e09467587c17.html
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 | 56 |
1 files changed, 28 insertions, 28 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 aad44bd5be98..e21a6d47f0cf 100644 --- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,15 +1,15 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2021-01-18 21:29:49 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2021-03-12 23:57:48 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -68,7 +68,7 @@ - #include "base/win/win_util.h" - #endif +@@ -71,7 +71,7 @@ --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // 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) #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -195,14 +195,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -239,14 +239,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke #endif return ui::TextEditCommand::DELETE_BACKWARD; } @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -270,7 +270,7 @@ bool IsControlKeyModifier(int flags) { +@@ -320,7 +320,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 @@ -35,39 +35,39 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -765,7 +765,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e - #endif - } +@@ -818,7 +818,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // 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 -@@ -812,7 +812,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event - if (!textfield) - return handled; +@@ -867,7 +867,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // 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) ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -966,7 +966,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo - } - +@@ -1023,7 +1023,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // 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) // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2256,7 +2256,7 @@ bool Textfield::PasteSelectionClipboard() { - } - +@@ -2343,7 +2343,7 @@ bool Textfield::PasteSelectionClipboard() { void Textfield::UpdateSelectionClipboard() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // 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()); |