corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1254629 - Make onKeyEvent more efficient; r=esawin

Browse Source 
When handling synthetic keys, don't remove existing compositions and
don't check for certain early exit conditions.
This commit is contained in:
Jim Chen
2016-03-11 13:47:22 -05:00
parent 7cea874fff
commit 9c73b547fe
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
widget/android/nsWindow.cpp
View File

@@ -2461,8 +2461,10 @@ nsWindow::GeckoViewSupport::OnKeyEvent(int32_t aAction, int32_t aKeyCode,
bool aIsSynthesizedImeKey, jni::Object::Param originalEvent) bool aIsSynthesizedImeKey, jni::Object::Param originalEvent)
{ {
RefPtr<nsWindow> kungFuDeathGrip(&window); RefPtr<nsWindow> kungFuDeathGrip(&window);
window.UserActivity(); if (!aIsSynthesizedImeKey) {
window.RemoveIMEComposition(); window.UserActivity();
window.RemoveIMEComposition();
}
EventMessage msg; EventMessage msg;
if (aAction == sdk::KeyEvent::ACTION_DOWN) { if (aAction == sdk::KeyEvent::ACTION_DOWN) {
@@ -2491,17 +2493,19 @@ nsWindow::GeckoViewSupport::OnKeyEvent(int32_t aAction, int32_t aKeyCode,
// these keys are dispatched in sequence. // these keys are dispatched in sequence.
mIMEKeyEvents.AppendElement( mIMEKeyEvents.AppendElement(
mozilla::UniquePtr<WidgetEvent>(event.Duplicate())); mozilla::UniquePtr<WidgetEvent>(event.Duplicate()));
} else { } else {
window.DispatchEvent(&event, status); window.DispatchEvent(&event, status);
if (status != nsEventStatus_eConsumeNoDefault) { if (window.Destroyed() || status == nsEventStatus_eConsumeNoDefault) {
mEditable->OnDefaultKeyEvent(originalEvent); // Skip default processing.
return;
} }
mEditable->OnDefaultKeyEvent(originalEvent);
} }
if (window.Destroyed() || if (msg != eKeyDown || IsModifierKey(aKeyCode)) {
status == nsEventStatus_eConsumeNoDefault ||
msg != eKeyDown || IsModifierKey(aKeyCode)) {
// Skip sending key press event. // Skip sending key press event.
return; return;
} }