summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
committerRene Ladan <rene@FreeBSD.org>2020-04-13 10:37:15 +0000
commite3b53fa1271f0ecfc6d650148fa6a2ce7fd59689 (patch)
tree4282b6dacc1a8a20ec4bc04900a236b3e3fb61a0 /www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
parentUpdate java plugin. (diff)
www/chromium: update to 81.0.4044.92
Currently the camera and geolocation do not work. Submitted by: Matthias Wolf Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/173 Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/174 MFH: 2020Q2 Security: https://www.vuxml.org/freebsd/6e3b700a-7ca3-11ea-b594-3065ec8fd3ec.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.cc18
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 15076b13a8f7..f22c358d52d8 100644
--- a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,4 +1,4 @@
---- ui/views/controls/textfield/textfield.cc.orig 2020-03-03 18:54:07 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2020-03-16 18:40:43 UTC
+++ ui/views/controls/textfield/textfield.cc
@@ -60,7 +60,7 @@
#include "base/win/win_util.h"
@@ -9,10 +9,10 @@
#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"
-@@ -178,14 +178,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
- case ui::VKEY_BACK:
- if (!control)
+@@ -183,14 +183,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke
+ #endif
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.
@@ -26,7 +26,7 @@
// Only erase by line break on Linux and ChromeOS.
if (shift && control)
return ui::TextEditCommand::DELETE_TO_END_OF_LINE;
-@@ -253,7 +253,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -258,7 +258,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;
-@@ -725,7 +725,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e
+@@ -730,7 +730,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
-@@ -771,7 +771,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -776,7 +776,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;
-@@ -918,7 +918,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -923,7 +923,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();
-@@ -2173,7 +2173,7 @@ bool Textfield::PasteSelectionClipboard() {
+@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() {
}
void Textfield::UpdateSelectionClipboard() {