diff options
| author | arv <arv@chromium.org> | 2014-09-08 08:39:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-08 15:44:49 +0000 |
| commit | 1125c1167a776f1da2a9196a12b40c91ffee04af (patch) | |
| tree | 1f117e43c2cb4912a9cc63ea098b06d1d14809d4 /mojo/services/native_viewport | |
| parent | 88aedae87bf34f9e8e3f36191bf1c08066f34405 (diff) | |
| download | chromium_src-1125c1167a776f1da2a9196a12b40c91ffee04af.zip chromium_src-1125c1167a776f1da2a9196a12b40c91ffee04af.tar.gz chromium_src-1125c1167a776f1da2a9196a12b40c91ffee04af.tar.bz2 | |
Revert of Removing X11 native_event uses for key events. (patchset #7 id:180001 of https://codereview.chromium.org/479873002/)
Reason for revert:
Broke Android Tests (dbg)
C 427.575s Main [FAIL] org.chromium.content.browser.input.ImeTest#testKeyCodesWhileComposingText:
C 427.575s Main junit.framework.AssertionFailedError
C 427.575s Main at org.chromium.content.browser.input.ImeTest.assertUpdateStateCall(ImeTest.java:694)
C 427.575s Main at org.chromium.content.browser.input.ImeTest.testKeyCodesWhileComposingText(ImeTest.java:410)
C 427.575s Main at java.lang.reflect.Method.invokeNative(Native Method)
C 427.575s Main at android.test.InstrumentationTestCase.runMethod(InstrumentationTestCase.java:214)
C 427.575s Main at android.test.InstrumentationTestCase.runTest(InstrumentationTestCase.java:199)
C 427.575s Main at android.test.ActivityInstrumentationTestCase2.runTest(ActivityInstrumentationTestCase2.java:192)
C 427.575s Main at org.chromium.content_shell_apk.ContentShellTestBase.runTest(ContentShellTestBase.java:227)
C 427.575s Main at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:191)
C 427.575s Main at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:176)
C 427.575s Main at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:554)
C 427.575s Main at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1701)
Original issue's description:
> Removing uses of X11 native key events.
>
> BUG=380349
>
> Committed: https://chromium.googlesource.com/chromium/src/+/bbb7ea7c66f18298079eea4a6b24834986f4a822
>
> Committed: https://chromium.googlesource.com/chromium/src/+/13d90b146a400156427243d05159cadd8d72c0b9
TBR=sadrul@chromium.org,sky@chromium.org,erg@chromium.org,jamesr@chromium.org,boliu@chromium.org,kpschoedel@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=380349
Review URL: https://codereview.chromium.org/548303003
Cr-Commit-Position: refs/heads/master@{#293732}
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/platform_viewport_x11.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc index d4914c7..dbf7fb8 100644 --- a/mojo/services/native_viewport/platform_viewport_x11.cc +++ b/mojo/services/native_viewport/platform_viewport_x11.cc @@ -104,9 +104,9 @@ class PlatformViewportX11 : public PlatformViewport, char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>( new MojoExtendedKeyEventData( - key_press_event->GetLocatedWindowsKeyboardCode(), - key_press_event->GetText(), - key_press_event->GetUnmodifiedText()))); + ui::WindowsKeycodeFromNative(key_press_event->native_event()), + ui::TextFromNative(key_press_event->native_event()), + ui::UnmodifiedTextFromNative(key_press_event->native_event())))); char_event.set_platform_keycode(key_press_event->platform_keycode()); delegate_->OnEvent(&char_event); |