diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-11-05 19:35:13 +0000 |
| commit | 03d66a659ae5011ca0d5279cafb1596a982a06d8 (patch) | |
| tree | b8c8cd52f300381a02e32bdea5d4eae6f30262fc /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | |
| parent | Update to 1.37.0 (diff) | |
www/chromium: update to 78.0.3904.87
Submitted by: Matthias Wolf via github
MFH: 2019Q4
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 | 18 |
1 files changed, 9 insertions, 9 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 bc17a9e94d20..d3cd68d764f7 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 2019-07-24 18:59:22 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2019-10-21 19:07:29 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -62,7 +62,7 @@ +@@ -60,7 +60,7 @@ #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -165,14 +165,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke +@@ -178,14 +178,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke case ui::VKEY_BACK: if (!control) 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; -@@ -240,7 +240,7 @@ bool IsControlKeyModifier(int flags) { +@@ -253,7 +253,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,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -675,7 +675,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -725,7 +725,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -721,7 +721,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -771,7 +771,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; -@@ -890,7 +890,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -918,7 +918,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,12 +62,12 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2109,7 +2109,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2170,7 +2170,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) + ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); |