Commit 440fd82e authored by fgorski@chromium.org's avatar fgorski@chromium.org

Revert 272428 "Add native event testing to chromeos::EventRewrit..."

The CL introduced unit test failures on Chromium OS ASan LSan Tests(3)
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%283%29/builds/1499

Failing tests:
EventRewriterTest.TestRewriteFunctionKeys
EventRewriterTest.TestRewriteModifiersDisableSome

> Add native event testing to chromeos::EventRewriter unit tests.
> 
> Most tests (not having state) are converted to a table-driven form,
> so that multiple test operations can be done on the same test data.
> Additional tests based on X11 native events are done on these cases.
> 
> The fallback X11 keycode to keysym mapping is expanded, because the
> X server used by some automated tests does not support some of the
> keycodes used by ChromeOS top-row special keys.
> 
> 
> R=sadrul@chromium.org
> 
> Review URL: https://codereview.chromium.org/270633012

TBR=kpschoedel@chromium.org

Review URL: https://codereview.chromium.org/295243004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272553 0039d316-1c4b-4281-b951-d872f2087c98
parent 7cccdb4b
......@@ -137,7 +137,6 @@ void UpdateX11EventMask(int ui_flags, unsigned int* x_flags) {
{ui::EF_ALT_DOWN, Mod1Mask},
{ui::EF_CAPS_LOCK_DOWN, LockMask},
{ui::EF_ALTGR_DOWN, Mod5Mask},
{ui::EF_COMMAND_DOWN, Mod4Mask},
{ui::EF_MOD3_DOWN, Mod3Mask},
{ui::EF_NUMPAD_KEY, Mod2Mask},
{ui::EF_LEFT_MOUSE_BUTTON, Button1Mask},
......
......@@ -23,10 +23,6 @@ unsigned int XEventState(int flags) {
((flags & ui::EF_CONTROL_DOWN) ? ControlMask : 0) |
((flags & ui::EF_ALT_DOWN) ? Mod1Mask : 0) |
((flags & ui::EF_CAPS_LOCK_DOWN) ? LockMask : 0) |
((flags & ui::EF_ALTGR_DOWN) ? Mod5Mask : 0) |
((flags & ui::EF_COMMAND_DOWN) ? Mod4Mask : 0) |
((flags & ui::EF_MOD3_DOWN) ? Mod3Mask : 0) |
((flags & ui::EF_NUMPAD_KEY) ? Mod2Mask : 0) |
((flags & ui::EF_LEFT_MOUSE_BUTTON) ? Button1Mask: 0) |
((flags & ui::EF_MIDDLE_MOUSE_BUTTON) ? Button2Mask: 0) |
((flags & ui::EF_RIGHT_MOUSE_BUTTON) ? Button3Mask: 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment