diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:04:00 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:04:00 +0000 |
| commit | 73490d026c9afb85aa626d02cf81b4974985e0aa (patch) | |
| tree | 195b3caec62347df766173fb874079dde664f56e /ash | |
| parent | 129da89f0e13a04d9a5b2be6be0de50c8f3c821c (diff) | |
| download | chromium_src-73490d026c9afb85aa626d02cf81b4974985e0aa.zip chromium_src-73490d026c9afb85aa626d02cf81b4974985e0aa.tar.gz chromium_src-73490d026c9afb85aa626d02cf81b4974985e0aa.tar.bz2 | |
Fix crash on key events in touchview.
BUG=362881
TEST=Key events no longer crash in touchview.
Review URL: https://codereview.chromium.org/294033016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/maximize_mode/internal_input_device_list_x11.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/wm/maximize_mode/internal_input_device_list_x11.cc b/ash/wm/maximize_mode/internal_input_device_list_x11.cc index 9a490ec..8753f82 100644 --- a/ash/wm/maximize_mode/internal_input_device_list_x11.cc +++ b/ash/wm/maximize_mode/internal_input_device_list_x11.cc @@ -44,8 +44,11 @@ InternalInputDeviceListX11::~InternalInputDeviceListX11() { bool InternalInputDeviceListX11::IsEventFromInternalDevice( const ui::Event* event) { - if (!event->HasNativeEvent()) + if (!event->HasNativeEvent() || + event->native_event()->type != GenericEvent) { return false; + } + XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>( event->native_event()->xcookie.data); return internal_device_ids_.find(xiev->sourceid) != |