summaryrefslogtreecommitdiffstats
path: root/webkit/glue/event_conversion.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 02:56:50 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 02:56:50 +0000
commitbbe50755c1a8d0cdea4b3b0699b70806dfae2e23 (patch)
tree3101f7c0a4823df86814561519b48ed68ce60cc3 /webkit/glue/event_conversion.cc
parent3ef4a79cc1d4659939b02258b39f78536c0c9d2d (diff)
downloadchromium_src-bbe50755c1a8d0cdea4b3b0699b70806dfae2e23.zip
chromium_src-bbe50755c1a8d0cdea4b3b0699b70806dfae2e23.tar.gz
chromium_src-bbe50755c1a8d0cdea4b3b0699b70806dfae2e23.tar.bz2
Undo part of issue 12981.
Review URL: http://codereview.chromium.org/13369 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/event_conversion.cc')
-rw-r--r--webkit/glue/event_conversion.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc
index 881cdae..fb8d1fb 100644
--- a/webkit/glue/event_conversion.cc
+++ b/webkit/glue/event_conversion.cc
@@ -283,8 +283,10 @@ MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e)
m_text = "\x9";
m_unmodifiedText = "\x9";
}
-#elif defined(OS_WIN) || defined(OS_LINUX)
+#elif defined(OS_WIN)
m_text = m_unmodifiedText = ToSingleCharacterString(e.key_code);
+#elif defined(OS_LINUX)
+ m_text = m_unmodifiedText = ToSingleCharacterString(e.text);
#endif
}
#if defined(OS_WIN) || defined(OS_LINUX)