diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-03-17 23:42:52 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-03-17 23:42:52 +0000 |
| commit | e292ba0099ecff2e3e31fcb6cac28ac8e243c43d (patch) | |
| tree | 1b74950e1b5750f688522886a8b73c01e56a18c5 /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | |
| parent | games/openra: update GeoLite2 to March snapshot (diff) | |
www/chromium: update to 57.0.2987.110
MFH: 2017Q1
Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.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 | 16 |
1 files changed, 8 insertions, 8 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 bc7c34cf4c0d..20dca0ff0af6 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 2017-01-26 00:49:32 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2017-03-09 20:04:49 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -53,7 +53,7 @@ +@@ -54,7 +54,7 @@ #include "ui/base/win/osk_display_manager.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" -@@ -146,14 +146,14 @@ ui::TextEditCommand GetCommandForKeyEven +@@ -153,14 +153,14 @@ ui::TextEditCommand GetCommandForKeyEven 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; -@@ -580,7 +580,7 @@ bool Textfield::OnMousePressed(const ui: +@@ -582,7 +582,7 @@ bool Textfield::OnMousePressed(const ui: ShowImeIfNeeded(); } @@ -35,7 +35,7 @@ if (!handled && !HasFocus() && event.IsOnlyMiddleMouseButton()) RequestFocus(); #endif -@@ -617,7 +617,7 @@ bool Textfield::OnKeyPressed(const ui::K +@@ -619,7 +619,7 @@ bool Textfield::OnKeyPressed(const ui::K if (!textfield) return handled; @@ -44,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -757,7 +757,7 @@ void Textfield::AboutToRequestFocusFromT +@@ -759,7 +759,7 @@ void Textfield::AboutToRequestFocusFromT } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -53,7 +53,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1035,7 +1035,7 @@ void Textfield::WriteDragDataForView(Vie +@@ -1041,7 +1041,7 @@ void Textfield::WriteDragDataForView(Vie std::unique_ptr<gfx::Canvas> canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); @@ -62,7 +62,7 @@ // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1827,7 +1827,7 @@ bool Textfield::PasteSelectionClipboard( +@@ -1833,7 +1833,7 @@ bool Textfield::PasteSelectionClipboard( } void Textfield::UpdateSelectionClipboard() { |