diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-11-22 19:10:21 +0000 |
| commit | 9187a6460fc419eec4dc64a4569e306722a83427 (patch) | |
| tree | b3d680efe613bd39a30a50f60bcb0ce36a78eab2 /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc | |
| parent | Some aarch64 servers apparently have ACPI. Attempt to build on aarch64 (diff) | |
www/chromium: update to 54.0.2840.100
Submitted by: clutton <clutton@zoho.com>
Reviewed by: cpm, rene
Obtained from: https://github.com/paranormal/
MFH: 2016Q4
Security: https://vuxml.freebsd.org/freebsd/769ba449-79e1-11e6-bf75-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/653a8059-7c49-11e6-9242-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9c135c7e-9fa4-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/9118961b-9fa5-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/ae9cb9b8-a203-11e6-a265-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/a3473f5a-a739-11e6-afaa-e8e0b747a45a.html
Differential Revision: https://reviews.freebsd.org/D8517
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 | 41 |
1 files changed, 16 insertions, 25 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 bfebeb7ee029..1ea8c8651e22 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,32 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2016-08-04 09:54:43.724487000 -0400 -+++ ui/views/controls/textfield/textfield.cc 2016-08-04 09:57:23.923660000 -0400 -@@ -48,7 +48,7 @@ - #include "base/win/win_util.h" +--- ui/views/controls/textfield/textfield.cc.orig 2016-10-06 04:02:45.000000000 +0300 ++++ ui/views/controls/textfield/textfield.cc 2016-10-13 09:32:03.632280000 +0300 +@@ -51,7 +51,7 @@ + #include "ui/base/win/osk_display_manager.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "base/strings/utf_string_conversions.h" - #include "ui/events/linux/text_edit_command_auralinux.h" - #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -131,14 +131,14 @@ + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" +@@ -156,14 +156,14 @@ case ui::VKEY_BACK: if (!control) - return IDS_DELETE_BACKWARD; + return ui::TextEditCommand::DELETE_BACKWARD; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift) - return IDS_DELETE_TO_BEGINNING_OF_LINE; + return ui::TextEditCommand::DELETE_TO_BEGINNING_OF_LINE; #endif - return IDS_DELETE_WORD_BACKWARD; + return ui::TextEditCommand::DELETE_WORD_BACKWARD; case ui::VKEY_DELETE: -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. if (shift && control) - return IDS_DELETE_TO_END_OF_LINE; -@@ -155,7 +155,7 @@ - } - } - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - // Convert a custom text edit |command| to the equivalent views command ID. - int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) { - const bool select = command.extend_selection(); -@@ -643,7 +643,7 @@ + return ui::TextEditCommand::DELETE_TO_END_OF_LINE; +@@ -596,7 +596,7 @@ OnAfterUserAction(); } @@ -44,7 +35,7 @@ if (event.IsOnlyMiddleMouseButton()) { if (GetRenderText()->IsPointInSelection(event.location())) { OnBeforeUserAction(); -@@ -712,7 +712,7 @@ +@@ -665,7 +665,7 @@ if (!textfield) return handled; @@ -53,7 +44,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -847,7 +847,7 @@ +@@ -805,7 +805,7 @@ } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,7 +53,7 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -1106,7 +1106,7 @@ +@@ -1065,7 +1065,7 @@ std::unique_ptr<gfx::Canvas> canvas( GetCanvasForDragImage(GetWidget(), label.size())); label.SetEnabledColor(GetTextColor()); @@ -71,7 +62,7 @@ // Desktop Linux Aura does not yet support transparency in drag images. canvas->DrawColor(GetBackgroundColor()); #endif -@@ -1908,7 +1908,7 @@ +@@ -2004,7 +2004,7 @@ } void Textfield::UpdateSelectionClipboard() const { |