diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 15:54:29 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-27 15:54:29 +0000 |
| commit | ecf5e4b1bfd56666e126d79931ff8e72f5b4a83f (patch) | |
| tree | 66eab1119bdf606c804881e726c239dc2c6042a5 /webkit/glue/event_conversion.cc | |
| parent | ce16adb506bee0650584c64575423e2d120c75bd (diff) | |
| download | chromium_src-ecf5e4b1bfd56666e126d79931ff8e72f5b4a83f.zip chromium_src-ecf5e4b1bfd56666e126d79931ff8e72f5b4a83f.tar.gz chromium_src-ecf5e4b1bfd56666e126d79931ff8e72f5b4a83f.tar.bz2 | |
Set all key event fields on mac, make sure we correctly handle keyDown
Review URL: http://codereview.chromium.org/8158
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/event_conversion.cc')
| -rw-r--r-- | webkit/glue/event_conversion.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc index 517e8c2..a0d3a8d 100644 --- a/webkit/glue/event_conversion.cc +++ b/webkit/glue/event_conversion.cc @@ -110,8 +110,7 @@ MakePlatformMouseEvent::MakePlatformMouseEvent(Widget* widget, // MakePlatformWheelEvent ----------------------------------------------------- MakePlatformWheelEvent::MakePlatformWheelEvent(Widget* widget, - const WebMouseWheelEvent& e) - { + const WebMouseWheelEvent& e) { m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y)); m_globalPosition = IntPoint(e.global_x, e.global_y); m_deltaX = static_cast<float>(e.delta_x); @@ -256,7 +255,6 @@ static String GetKeyIdentifierForWindowsKeyCode(unsigned short keyCode) { MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e) { -#if defined(OS_WIN) || defined(OS_LINUX) m_type = ToPlatformKeyboardEventType(e.type); if (m_type == Char || m_type == KeyDown) m_text = m_unmodifiedText = ToSingleCharacterString(e.key_code); @@ -268,7 +266,6 @@ MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e) } else { m_windowsVirtualKeyCode = 0; } -#endif m_autoRepeat = (e.modifiers & WebInputEvent::IS_AUTO_REPEAT) != 0; m_isKeypad = (e.modifiers & WebInputEvent::IS_KEYPAD) != 0; m_shiftKey = (e.modifiers & WebInputEvent::SHIFT_KEY) != 0; |