Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: ash/sticky_keys/sticky_keys_controller.cc

Issue 227113009: Fix sticky keys crash when handling synthetic events without a native event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/sticky_keys/sticky_keys_controller.h" 5 #include "ash/sticky_keys/sticky_keys_controller.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #undef RootWindow 10 #undef RootWindow
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 void StickyKeysHandlerDelegateImpl::DispatchKeyEvent(ui::KeyEvent* event, 62 void StickyKeysHandlerDelegateImpl::DispatchKeyEvent(ui::KeyEvent* event,
63 aura::Window* target) { 63 aura::Window* target) {
64 DispatchEvent(event, target); 64 DispatchEvent(event, target);
65 } 65 }
66 66
67 void StickyKeysHandlerDelegateImpl::DispatchMouseEvent(ui::MouseEvent* event, 67 void StickyKeysHandlerDelegateImpl::DispatchMouseEvent(ui::MouseEvent* event,
68 aura::Window* target) { 68 aura::Window* target) {
69 DCHECK(target); 69 DCHECK(target);
70 // We need to send a new, untransformed mouse event to the host. 70 // We need to send a new, untransformed mouse event to the host.
71 if (event->IsMouseWheelEvent()) { 71 if (event->IsMouseWheelEvent()) {
72 ui::MouseWheelEvent new_event(event->native_event()); 72 aura::Window* source = static_cast<aura::Window*>(event->target());
73 ui::MouseWheelEvent new_event(*static_cast<ui::MouseWheelEvent*>(event),
74 source,
75 source->GetRootWindow());
76 // Transform the location back to host coordinates before dispatching.
77 new_event.UpdateForRootTransform(source->GetHost()->GetRootTransform());
73 DispatchEvent(&new_event, target); 78 DispatchEvent(&new_event, target);
74 } else { 79 } else {
75 ui::MouseEvent new_event(event->native_event()); 80 aura::Window* source = static_cast<aura::Window*>(event->target());
81 ui::MouseEvent new_event(*event, source, source->GetRootWindow());
82 // Transform the location back to host coordinates before dispatching.
83 new_event.UpdateForRootTransform(source->GetHost()->GetRootTransform());
76 DispatchEvent(&new_event, target); 84 DispatchEvent(&new_event, target);
77 } 85 }
78 } 86 }
79 87
80 void StickyKeysHandlerDelegateImpl::DispatchScrollEvent( 88 void StickyKeysHandlerDelegateImpl::DispatchScrollEvent(
81 ui::ScrollEvent* event, 89 ui::ScrollEvent* event,
82 aura::Window* target) { 90 aura::Window* target) {
83 DispatchEvent(event, target); 91 DispatchEvent(event, target);
84 } 92 }
85 93
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 event->set_flags(event->flags() | modifier_flag_); 481 event->set_flags(event->flags() | modifier_flag_);
474 event->set_character(ui::GetCharacterFromKeyCode(event->key_code(), 482 event->set_character(ui::GetCharacterFromKeyCode(event->key_code(),
475 event->flags())); 483 event->flags()));
476 event->NormalizeFlags(); 484 event->NormalizeFlags();
477 } 485 }
478 486
479 void StickyKeysHandler::AppendModifier(ui::MouseEvent* event) { 487 void StickyKeysHandler::AppendModifier(ui::MouseEvent* event) {
480 #if defined(USE_X11) 488 #if defined(USE_X11)
481 // The native mouse event can either be a classic X button event or an 489 // The native mouse event can either be a classic X button event or an
482 // XInput2 button event. 490 // XInput2 button event.
483 XEvent* xev = event->native_event(); 491 XEvent* xev = event->native_event();
sadrul 2014/04/07 22:32:10 Since you are creating the mouse-event directly fr
Tim Song 2014/04/07 22:53:59 The X event modification was also needed for prope
sadrul 2014/04/08 03:01:34 Perhaps the X-event mutation isn't needed in the o
484 if (xev) { 492 if (xev) {
485 switch (xev->type) { 493 switch (xev->type) {
486 case ButtonPress: 494 case ButtonPress:
487 case ButtonRelease: { 495 case ButtonRelease: {
488 XButtonEvent* xkey = &(xev->xbutton); 496 XButtonEvent* xkey = &(xev->xbutton);
489 AppendNativeEventMask(&xkey->state); 497 AppendNativeEventMask(&xkey->state);
490 break; 498 break;
491 } 499 }
492 case GenericEvent: { 500 case GenericEvent: {
493 XIDeviceEvent* xievent = 501 XIDeviceEvent* xievent =
494 static_cast<XIDeviceEvent*>(xev->xcookie.data); 502 static_cast<XIDeviceEvent*>(xev->xcookie.data);
495 CHECK(xievent->evtype == XI_ButtonPress || 503 CHECK(xievent->evtype == XI_ButtonPress ||
496 xievent->evtype == XI_ButtonRelease); 504 xievent->evtype == XI_ButtonRelease);
497 AppendNativeEventMask( 505 AppendNativeEventMask(
498 reinterpret_cast<unsigned int*>(&xievent->mods.effective)); 506 reinterpret_cast<unsigned int*>(&xievent->mods.effective));
499 break; 507 break;
500 } 508 }
501 default: 509 default:
502 NOTREACHED(); 510 NOTREACHED();
503 } 511 }
504 } 512 }
505 #elif defined(USE_OZONE) 513 #elif defined(USE_OZONE)
506 NOTIMPLEMENTED() << "Modifier key is not handled"; 514 NOTIMPLEMENTED() << "Modifier key is not handled";
507 #endif 515 #endif
508 event->set_flags(event->flags() | modifier_flag_); 516 event->set_flags(event->flags() | modifier_flag_);
sadrul 2014/04/07 22:32:10 Since this is not the event you dispatch, do you n
Tim Song 2014/04/07 22:53:59 There are two sticky key states, normal (press mod
509 } 517 }
510 518
511 void StickyKeysHandler::AppendModifier(ui::ScrollEvent* event) { 519 void StickyKeysHandler::AppendModifier(ui::ScrollEvent* event) {
512 #if defined(USE_X11) 520 #if defined(USE_X11)
513 XEvent* xev = event->native_event(); 521 XEvent* xev = event->native_event();
514 if (xev) { 522 if (xev) {
515 XIDeviceEvent* xievent = 523 XIDeviceEvent* xievent =
516 static_cast<XIDeviceEvent*>(xev->xcookie.data); 524 static_cast<XIDeviceEvent*>(xev->xcookie.data);
517 if (xievent) { 525 if (xievent) {
518 AppendNativeEventMask(reinterpret_cast<unsigned int*>( 526 AppendNativeEventMask(reinterpret_cast<unsigned int*>(
519 &xievent->mods.effective)); 527 &xievent->mods.effective));
520 } 528 }
521 } 529 }
522 #elif defined(USE_OZONE) 530 #elif defined(USE_OZONE)
523 NOTIMPLEMENTED() << "Modifier key is not handled"; 531 NOTIMPLEMENTED() << "Modifier key is not handled";
524 #endif 532 #endif
525 event->set_flags(event->flags() | modifier_flag_); 533 event->set_flags(event->flags() | modifier_flag_);
526 } 534 }
527 535
528 } // namespace ash 536 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698