ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc - Issue 841263005: Use DOM- rather than Windows-based key code for non-layout cases.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

Issue 841263005: Use DOM- rather than Windows-based key code for non-layout cases. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ui/events/keycodes/keyboard_code_conversion.h ('K') | « ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h ('k') | ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

index c1bfca67fabcc69dd6883cd40e523300e95b8b24..b38ccd0ac297ff013034a5d20ea93b25e4805d34 100644

--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc

@@ -18,6 +18,7 @@

#include "ui/events/keycodes/dom3/dom_key.h"

#include "ui/events/keycodes/dom4/keycode_converter.h"

#include "ui/events/keycodes/keyboard_code_conversion.h"

+#include "ui/events/keycodes/keyboard_code_conversion.h"

#include "ui/events/ozone/layout/layout_util.h"

#include "ui/events/ozone/layout/xkb/xkb_keyboard_code_conversion.h"

@@ -773,7 +774,8 @@ bool XkbKeyboardLayoutEngine::Lookup(DomCode dom_code,

*key_code = DifficultKeyboardCode(dom_code, flags, xkb_keycode, xkb_flags,

xkb_keysym, *dom_key, *character);

if (*key_code == VKEY_UNKNOWN)

- *key_code = DomCodeToNonLocatedKeyboardCode(dom_code);

+ *key_code =

+ LocatedToNonLocatedKeyboardCode(DomCodeToKeyboardCode(dom_code));

}

if ((flags & EF_CONTROL_DOWN) == EF_CONTROL_DOWN) {

@@ -783,11 +785,13 @@ bool XkbKeyboardLayoutEngine::Lookup(DomCode dom_code,

}

} else if (*dom_key == DomKey::DEAD) {

*character = DeadXkbKeySymToCombiningCharacter(xkb_keysym);

- *key_code = DomCodeToNonLocatedKeyboardCode(dom_code);

+ *key_code =

+ LocatedToNonLocatedKeyboardCode(DomCodeToKeyboardCode(dom_code));

} else {

*key_code = NonPrintableDomKeyToKeyboardCode(*dom_key);

if (*key_code == VKEY_UNKNOWN)

- *key_code = DomCodeToNonLocatedKeyboardCode(dom_code);

+ *key_code =

+ LocatedToNonLocatedKeyboardCode(DomCodeToKeyboardCode(dom_code));

}

return true;

}