From e1a3085fb9ca54583eb13f468930da0e8d1a95ba Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 7 Nov 2018 13:45:18 -0800 Subject: [PATCH 1/2] fix: correctly display zoom in accelerator on mac --- patches/common/chromium/.patches | 1 + .../common/chromium/fix_zoom_display.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 patches/common/chromium/fix_zoom_display.patch diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches index 0f36fbd99f67a..726afa8a82cc2 100644 --- a/patches/common/chromium/.patches +++ b/patches/common/chromium/.patches @@ -79,3 +79,4 @@ content_browser_main_loop.patch dump_syms.patch web_preferences.patch verbose_generate_breakpad_symbols.patch +fix_zoom_display.patch diff --git a/patches/common/chromium/fix_zoom_display.patch b/patches/common/chromium/fix_zoom_display.patch new file mode 100644 index 0000000000000..d384fb53e4225 --- /dev/null +++ b/patches/common/chromium/fix_zoom_display.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Web Oct 31 00:00:00 2001 +From: Shelley Vohr +Date: Web, 31 Oct 2018 09:08:02 -0700 +Subject: fix_zoom_display.patch + +This patch was released in 70.0.3512.0. + +diff --git a/ui/base/accelerators/platform_accelerator_cocoa.mm b/ui/base/accelerators/platform_accelerator_cocoa.mm +index 9786168be893..3c177060453a 100644 +--- a/ui/base/accelerators/platform_accelerator_cocoa.mm ++++ b/ui/base/accelerators/platform_accelerator_cocoa.mm +@@ -25,9 +25,16 @@ void GetKeyEquivalentAndModifierMaskFromAccelerator( + if (accelerator.IsCmdDown()) + cocoa_modifiers |= NSEventModifierFlagCommand; + unichar shifted_character; ++ unichar character; + int result = ui::MacKeyCodeForWindowsKeyCode( +- accelerator.key_code(), cocoa_modifiers, &shifted_character, nullptr); +- DCHECK(result != -1); ++ accelerator.key_code(), cocoa_modifiers, &shifted_character, &character); ++ DCHECK_NE(result, -1); ++ ++ // If the key equivalent is itself shifted, then drop Shift from the modifier ++ // flags, otherwise Shift will be required. E.g., curly braces and plus are ++ // both inherently shifted, so the key equivalents shouldn't require Shift. ++ if (shifted_character != character) ++ cocoa_modifiers &= ~NSEventModifierFlagShift; + *key_equivalent = [NSString stringWithFormat:@"%C", shifted_character]; + *modifier_mask = cocoa_modifiers; + } From 01c885874b75d76e4ae6d142682dbd3e27787215 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 7 Nov 2018 14:47:05 -0800 Subject: [PATCH 2/2] add original CL --- patches/common/chromium/fix_zoom_display.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/patches/common/chromium/fix_zoom_display.patch b/patches/common/chromium/fix_zoom_display.patch index d384fb53e4225..d868153762db7 100644 --- a/patches/common/chromium/fix_zoom_display.patch +++ b/patches/common/chromium/fix_zoom_display.patch @@ -3,6 +3,7 @@ From: Shelley Vohr Date: Web, 31 Oct 2018 09:08:02 -0700 Subject: fix_zoom_display.patch +Backport of https://chromium-review.googlesource.com/c/chromium/src/+/1157224. This patch was released in 70.0.3512.0. diff --git a/ui/base/accelerators/platform_accelerator_cocoa.mm b/ui/base/accelerators/platform_accelerator_cocoa.mm