diff options
author | kpschoedel <kpschoedel@chromium.org> | 2015-04-23 07:18:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 14:18:25 +0000 |
commit | 742b7ff8c1b4eda8c740ee586efa6ca07fc2930b (patch) | |
tree | 3312698bee144d9f1951a669d2466eb7f77ce026 /ash | |
parent | 1a285faf58a6bac870e394569258818958f812f8 (diff) | |
download | chromium_src-742b7ff8c1b4eda8c740ee586efa6ca07fc2930b.zip chromium_src-742b7ff8c1b4eda8c740ee586efa6ca07fc2930b.tar.gz chromium_src-742b7ff8c1b4eda8c740ee586efa6ca07fc2930b.tar.bz2 |
Revert of Ozone support for device special cases in keyboard event rewriting. (patchset #6 id:120001 of https://codereview.chromium.org/1073573002/)
Reason for revert:
Bisected this CL for crbug.com/478605.
Chrome crashes upon start-up in ASAN builds, suggesting there is a invalid memory access somewhere in this CL.
Original issue's description:
> Ozone support for device special cases in keyboard event rewriting.
>
> Keyboard event rewriting has some special cases keyed on the device
> name (Apple keyboards) or USB VID/PID (Hotrod remote), which had been
> handled by special-case device inspection under X11, and not handled
> at all under Ozone. This moves the properties to ui::DeviceDataManager
> and makes the use in chromeos::EventRewriter platform-independent.
>
> BUG=471753
>
> Committed: https://crrev.com/711f2fc883c05bb10466fb65fdaf9bc10c909b23
> Cr-Commit-Position: refs/heads/master@{#325660}
TBR=sadrul@chromium.org,spang@chromium.org,derat@chromium.org,kpschoedel@chromium.org
BUG=471753, 478605
Review URL: https://codereview.chromium.org/1097393011
Cr-Commit-Position: refs/heads/master@{#326508}
Diffstat (limited to 'ash')
-rw-r--r-- | ash/test/virtual_keyboard_test_helper.cc | 9 | ||||
-rw-r--r-- | ash/touch/touch_transformer_controller_unittest.cc | 2 | ||||
-rw-r--r-- | ash/touch/touchscreen_util_unittest.cc | 45 | ||||
-rw-r--r-- | ash/virtual_keyboard_controller_unittest.cc | 79 |
4 files changed, 60 insertions, 75 deletions
diff --git a/ash/test/virtual_keyboard_test_helper.cc b/ash/test/virtual_keyboard_test_helper.cc index c920213..5cb39db 100644 --- a/ash/test/virtual_keyboard_test_helper.cc +++ b/ash/test/virtual_keyboard_test_helper.cc @@ -17,14 +17,13 @@ void VirtualKeyboardTestHelper::SuppressKeyboard() { ui::DeviceHotplugEventObserver* manager = ui::DeviceDataManager::GetInstance(); std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); manager->OnTouchscreenDevicesUpdated(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); manager->OnKeyboardDevicesUpdated(keyboards); } diff --git a/ash/touch/touch_transformer_controller_unittest.cc b/ash/touch/touch_transformer_controller_unittest.cc index 7662346..2a5131a 100644 --- a/ash/touch/touch_transformer_controller_unittest.cc +++ b/ash/touch/touch_transformer_controller_unittest.cc @@ -33,7 +33,7 @@ DisplayInfo CreateDisplayInfo(int64 id, ui::TouchscreenDevice CreateTouchscreenDevice(unsigned int id, const gfx::Size& size) { return ui::TouchscreenDevice(id, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, - std::string(), size, 0); + size, 0); } } // namespace diff --git a/ash/touch/touchscreen_util_unittest.cc b/ash/touch/touchscreen_util_unittest.cc index ce14702..ea88753 100644 --- a/ash/touch/touchscreen_util_unittest.cc +++ b/ash/touch/touchscreen_util_unittest.cc @@ -76,12 +76,10 @@ TEST_F(TouchscreenUtilTest, NoTouchscreens) { TEST_F(TouchscreenUtilTest, OneToOneMapping) { std::vector<ui::TouchscreenDevice> devices; - devices.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(800, 600), 0)); - devices.push_back( - ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(1024, 768), 0)); + devices.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(800, 600), 0)); + devices.push_back(ui::TouchscreenDevice( + 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1024, 768), 0)); AssociateTouchscreens(&displays_, devices); @@ -93,9 +91,8 @@ TEST_F(TouchscreenUtilTest, OneToOneMapping) { TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) { std::vector<ui::TouchscreenDevice> devices; - devices.push_back( - ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(1024, 768), 0)); + devices.push_back(ui::TouchscreenDevice( + 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1024, 768), 0)); AssociateTouchscreens(&displays_, devices); @@ -107,12 +104,10 @@ TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) { TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) { std::vector<ui::TouchscreenDevice> devices; - devices.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(801, 600), 0)); - devices.push_back( - ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(1023, 768), 0)); + devices.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(801, 600), 0)); + devices.push_back(ui::TouchscreenDevice( + 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1023, 768), 0)); AssociateTouchscreens(&displays_, devices); @@ -124,12 +119,10 @@ TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) { TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) { std::vector<ui::TouchscreenDevice> devices; - devices.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(1022, 768), 0)); - devices.push_back( - ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(802, 600), 0)); + devices.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1022, 768), 0)); + devices.push_back(ui::TouchscreenDevice( + 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(802, 600), 0)); AssociateTouchscreens(&displays_, devices); @@ -141,12 +134,10 @@ TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) { TEST_F(TouchscreenUtilTest, MapInternalTouchscreen) { std::vector<ui::TouchscreenDevice> devices; - devices.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "", - gfx::Size(1920, 1080), 0)); - devices.push_back( - ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "", - gfx::Size(9999, 888), 0)); + devices.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1920, 1080), 0)); + devices.push_back(ui::TouchscreenDevice( + 2, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(9999, 888), 0)); AssociateTouchscreens(&displays_, devices); diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc index f7a59ef..7ca7a2a 100644 --- a/ash/virtual_keyboard_controller_unittest.cc +++ b/ash/virtual_keyboard_controller_unittest.cc @@ -46,8 +46,9 @@ class VirtualKeyboardControllerTest : public AshTestBase { // Sets the event blocker on the maximized window controller. void SetEventBlocker( scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) { - Shell::GetInstance()->maximize_mode_controller()->event_blocker_ = - blocker.Pass(); + Shell::GetInstance() + ->maximize_mode_controller() + ->event_blocker_ = blocker.Pass(); } void SetUp() override { @@ -83,8 +84,8 @@ class MockEventBlocker : public ScopedDisableInternalMouseAndKeyboard { MockEventBlocker() {} ~MockEventBlocker() override { std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); ui::DeviceHotplugEventObserver* manager = ui::DeviceDataManager::GetInstance(); manager->OnKeyboardDevicesUpdated(keyboards); @@ -101,8 +102,8 @@ TEST_F(VirtualKeyboardControllerTest, RestoreKeyboardDevices) { Shell::GetInstance() ->maximize_mode_controller() ->EnableMaximizeModeWindowManager(true); - scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker( - new MockEventBlocker); + scoped_ptr<ScopedDisableInternalMouseAndKeyboard> + blocker(new MockEventBlocker); SetEventBlocker(blocker.Pass()); } @@ -156,13 +157,12 @@ class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest, // present and maximized mode is disabled. TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfInternalKeyboardPresent) { std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); UpdateTouchscreenDevices(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); UpdateKeyboardDevices(keyboards); ASSERT_FALSE(keyboard::IsKeyboardEnabled()); // Remove the internal keyboard. Virtual keyboard should now show. @@ -176,9 +176,8 @@ TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfInternalKeyboardPresent) { TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfNoTouchScreen) { std::vector<ui::TouchscreenDevice> devices; // Add a touchscreen. Keyboard should deploy. - devices.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, - "Touchscreen", gfx::Size(800, 600), 0)); + devices.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(800, 600), 0)); UpdateTouchscreenDevices(devices); EXPECT_TRUE(keyboard::IsKeyboardEnabled()); // Remove touchscreen. Keyboard should hide. @@ -188,13 +187,12 @@ TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfNoTouchScreen) { TEST_F(VirtualKeyboardControllerAutoTest, SuppressedIfExternalKeyboardPresent) { std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); UpdateTouchscreenDevices(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); UpdateKeyboardDevices(keyboards); ASSERT_FALSE(keyboard::IsKeyboardEnabled()); ASSERT_TRUE(notified()); @@ -227,12 +225,12 @@ TEST_F(VirtualKeyboardControllerAutoTest, SuppressedIfExternalKeyboardPresent) { // Tests handling multiple keyboards. Catches crbug.com/430252 TEST_F(VirtualKeyboardControllerAutoTest, HandleMultipleKeyboardsPresent) { std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard")); - keyboards.push_back(ui::KeyboardDevice( - 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); - keyboards.push_back(ui::KeyboardDevice( - 3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); + keyboards.push_back( + ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); + keyboards.push_back( + ui::KeyboardDevice(3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); UpdateKeyboardDevices(keyboards); ASSERT_FALSE(keyboard::IsKeyboardEnabled()); } @@ -240,13 +238,12 @@ TEST_F(VirtualKeyboardControllerAutoTest, HandleMultipleKeyboardsPresent) { // Tests maximized mode interaction without disabling the internal keyboard. TEST_F(VirtualKeyboardControllerAutoTest, EnabledDuringMaximizeMode) { std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); UpdateTouchscreenDevices(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); UpdateKeyboardDevices(keyboards); ASSERT_FALSE(keyboard::IsKeyboardEnabled()); // Toggle maximized mode on. @@ -264,15 +261,14 @@ TEST_F(VirtualKeyboardControllerAutoTest, EnabledDuringMaximizeMode) { // Tests that keyboard gets suppressed in maximized mode. TEST_F(VirtualKeyboardControllerAutoTest, SuppressedInMaximizedMode) { std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); UpdateTouchscreenDevices(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard")); - keyboards.push_back(ui::KeyboardDevice( - 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "Keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL)); + keyboards.push_back( + ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); UpdateKeyboardDevices(keyboards); // Toggle maximized mode on. Shell::GetInstance() @@ -333,13 +329,12 @@ class VirtualKeyboardControllerAlwaysEnabledTest // keyboard always enabled flag is active. TEST_F(VirtualKeyboardControllerAlwaysEnabledTest, DoesNotSuppressKeyboard) { std::vector<ui::TouchscreenDevice> screens; - screens.push_back( - ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, - "Touchscreen", gfx::Size(1024, 768), 0)); + screens.push_back(ui::TouchscreenDevice( + 1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0)); UpdateTouchscreenDevices(screens); std::vector<ui::KeyboardDevice> keyboards; - keyboards.push_back(ui::KeyboardDevice( - 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); + keyboards.push_back( + ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)); UpdateKeyboardDevices(keyboards); ASSERT_TRUE(keyboard::IsKeyboardEnabled()); } |