chore: remove mips64el patches as they've largely been upstreamed (#18628)

2019-06-05 16:36:17 -07:00 · 2019-06-05 16:36:17 -07:00 · 4b9da4dd0e
commit 4b9da4dd0e
parent a45afddb75
112 changed files with 10 additions and 73370 deletions
--- a/patches/chromium/accelerator.patch
+++ b/patches/chromium/accelerator.patch
@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Cheng Zhao <zcbenz@gmail.com>
+Date: Thu, 4 Oct 2018 14:57:02 -0700
+Subject: accelerator.patch
+
+This patch makes three changes to Accelerator::GetShortcutText to improve shortcut display text in menus:
+
+1. Ctrl-Alt-<Key> accelerators show as Ctrl-Alt-<Key> instead of as Ctrl-<Key>
+2. F2-F24 accelerators show up as such
+3. Ctrl-Shift-= should show as Ctrl-+
+
+diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
+index dadc140e9429c166ecd4c653c9ef5d0d4c4db2a4..bc93a9ecb28ff6973fc4d15f67a17d545c169a89 100644
+--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
+@@ -11,6 +11,7 @@
+ #include "base/logging.h"
+ #include "base/strings/strcat.h"
+ #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "build/build_config.h"
+ #include "ui/base/l10n/l10n_util.h"
+@@ -22,9 +23,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if !defined(OS_WIN) && (defined(USE_AURA) || defined(OS_MACOSX))
+ #include "ui/events/keycodes/keyboard_code_conversion.h"
+-#endif
+ 
+ namespace ui {
+ 
+@@ -150,7 +149,15 @@ base::string16 Accelerator::GetShortcutText() const {
+   shortcut = KeyCodeToName(key_code_);
+ #endif
+ 
+  unsigned int flags = 0;
+   if (shortcut.empty()) {
+    const uint16_t c = DomCodeToUsLayoutCharacter(
+        UsLayoutKeyboardCodeToDomCode(key_code_), flags);
+    if (c != 0) {
+      shortcut =
+          static_cast<base::string16::value_type>(
+              base::ToUpperASCII(static_cast<base::char16>(c)));
+    }
+ #if defined(OS_WIN)
+     // Our fallback is to try translate the key code to a regular character
+     // unless it is one of digits (VK_0 to VK_9). Some keyboard
+@@ -159,21 +166,14 @@ base::string16 Accelerator::GetShortcutText() const {
+     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
+     // default zoom level), we leave VK_[0-9] alone without translation.
+     wchar_t key;
+-    if (base::IsAsciiDigit(key_code_))
+    if (base::IsAsciiDigit(key_code_)) {
+       key = static_cast<wchar_t>(key_code_);
+-    else
+-      key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
+-    // If there is no translation for the given |key_code_| (e.g.
+-    // VKEY_UNKNOWN), |::MapVirtualKeyW| returns 0.
+-    if (key != 0)
+-      shortcut += key;
+-#elif defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_ANDROID)
+-    const uint16_t c = DomCodeToUsLayoutCharacter(
+-        UsLayoutKeyboardCodeToDomCode(key_code_), false);
+-    if (c != 0)
+-      shortcut +=
+-          static_cast<base::string16::value_type>(base::ToUpperASCII(c));
+      shortcut = key;
+    }
+ #endif
+    if (key_code_ > VKEY_F1 && key_code_ <= VKEY_F24)
+      shortcut = base::UTF8ToUTF16(
+          base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
+   }
+ 
+   // Checking whether the character used for the accelerator is alphanumeric.
+@@ -237,7 +237,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
+   // more information.
+   if (IsCtrlDown())
+     shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);
+-  else if (IsAltDown())
+  if (IsAltDown())
+     shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_ALT_KEY);
+ 
+   if (IsCmdDown()) {