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

Side by Side Diff: ui/events/event.cc

Issue 492863002: mojo: Plumb through sufficient context to make real blink::WebInputEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final sky nits Created 6 years, 4 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
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/events/event.h" 5 #include "ui/events/event.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 #endif 10 #endif
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 is_char_(false), 613 is_char_(false),
614 platform_keycode_(0), 614 platform_keycode_(0),
615 character_(GetCharacterFromKeyCode(key_code, flags)) { 615 character_(GetCharacterFromKeyCode(key_code, flags)) {
616 } 616 }
617 617
618 KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags) 618 KeyEvent::KeyEvent(base::char16 character, KeyboardCode key_code, int flags)
619 : Event(ET_KEY_PRESSED, EventTimeForNow(), flags), 619 : Event(ET_KEY_PRESSED, EventTimeForNow(), flags),
620 key_code_(key_code), 620 key_code_(key_code),
621 code_(""), 621 code_(""),
622 is_char_(true), 622 is_char_(true),
623 platform_keycode_(0),
623 character_(character) { 624 character_(character) {
624 } 625 }
625 626
627 KeyEvent::KeyEvent(const KeyEvent& rhs)
628 : Event(rhs),
629 key_code_(rhs.key_code_),
630 code_(rhs.code_),
631 is_char_(rhs.is_char_),
632 platform_keycode_(rhs.platform_keycode_),
633 character_(rhs.character_) {
634 if (rhs.extended_key_event_data_)
635 extended_key_event_data_.reset(rhs.extended_key_event_data_->Clone());
636 }
637
638 KeyEvent& KeyEvent::operator=(const KeyEvent& rhs) {
639 if (this != &rhs) {
640 Event::operator=(rhs);
641 key_code_ = rhs.key_code_;
642 code_ = rhs.code_;
643 is_char_ = rhs.is_char_;
644 platform_keycode_ = rhs.platform_keycode_;
645 character_ = rhs.character_;
646
647 if (rhs.extended_key_event_data_)
648 extended_key_event_data_.reset(rhs.extended_key_event_data_->Clone());
649 }
650 return *this;
651 }
652
653 KeyEvent::~KeyEvent() {}
654
655 void KeyEvent::SetExtendedKeyEventData(scoped_ptr<ExtendedKeyEventData> data) {
656 extended_key_event_data_ = data.Pass();
657 }
658
626 base::char16 KeyEvent::GetCharacter() const { 659 base::char16 KeyEvent::GetCharacter() const {
627 if (character_) 660 if (character_)
628 return character_; 661 return character_;
629 662
630 #if defined(OS_WIN) 663 #if defined(OS_WIN)
631 return (native_event().message == WM_CHAR) ? key_code_ : 664 return (native_event().message == WM_CHAR) ? key_code_ :
632 GetCharacterFromKeyCode(key_code_, flags()); 665 GetCharacterFromKeyCode(key_code_, flags());
633 #elif defined(USE_X11) 666 #elif defined(USE_X11)
634 if (!native_event()) 667 if (!native_event())
635 return GetCharacterFromKeyCode(key_code_, flags()); 668 return GetCharacterFromKeyCode(key_code_, flags());
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 gfx::PointF(x, y), 824 gfx::PointF(x, y),
792 time_stamp, 825 time_stamp,
793 flags | EF_FROM_TOUCH), 826 flags | EF_FROM_TOUCH),
794 details_(details) { 827 details_(details) {
795 } 828 }
796 829
797 GestureEvent::~GestureEvent() { 830 GestureEvent::~GestureEvent() {
798 } 831 }
799 832
800 } // namespace ui 833 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698