mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 895274 part.11 Rename NS_KEY_DOWN to eKeyDown r=smaug

This commit is contained in:
Masayuki Nakano 2015-08-29 08:58:27 +09:00
Родитель 28c9f34179
Коммит ba5b3f3fe6
29 изменённых файлов: 60 добавлений и 62 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/base/TextInputProcessor.cpp
Просмотреть файл

@ -249,7 +249,7 @@ TextInputProcessor::IsValidEventTypeForComposition(
const WidgetKeyboardEvent& aKeyboardEvent) const
{
// The key event type of composition methods must be "" or "keydown".
if (aKeyboardEvent.mMessage == NS_KEY_DOWN) {
if (aKeyboardEvent.mMessage == eKeyDown) {
return true;
}
if (aKeyboardEvent.mMessage == NS_USER_DEFINED_EVENT &&
@ -310,9 +310,9 @@ TextInputProcessor::MaybeDispatchKeyupForComposition(
return result;
}
// If the mMessage is NS_KEY_DOWN, the caller doesn't want TIP to dispatch
// If the mMessage is eKeyDown, the caller doesn't want TIP to dispatch
// keyup event.
if (aKeyboardEvent->mMessage == NS_KEY_DOWN) {
if (aKeyboardEvent->mMessage == eKeyDown) {
return result;
}
@ -838,7 +838,7 @@ TextInputProcessor::KeydownInternal(const WidgetKeyboardEvent& aKeyboardEvent,
nsEventStatus status = aConsumedFlags ? nsEventStatus_eConsumeNoDefault :
nsEventStatus_eIgnore;
if (!mDispatcher->DispatchKeyboardEvent(NS_KEY_DOWN, keyEvent, status,
if (!mDispatcher->DispatchKeyboardEvent(eKeyDown, keyEvent, status,
GetDispatchTo())) {
// If keydown event isn't dispatched, we don't need to dispatch keypress
// events.

2
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -7724,7 +7724,7 @@ nsContentUtils::SendKeyEvent(nsIWidget* aWidget,
EventMessage msg;
if (aType.EqualsLiteral("keydown"))
msg = NS_KEY_DOWN;
msg = eKeyDown;
else if (aType.EqualsLiteral("keyup"))
msg = eKeyUp;
else if (aType.EqualsLiteral("keypress"))

2
dom/events/Event.cpp
Просмотреть файл

@ -786,7 +786,7 @@ Event::GetEventPopupControlState(WidgetEvent* aEvent, nsIDOMEvent* aDOMEvent)
abuse = openControlled;
}
break;
case NS_KEY_DOWN :
case eKeyDown:
if (PopupAllowedForEvent("keydown")) {
abuse = openControlled;
}

2
dom/events/EventNameList.h
Просмотреть файл

@ -227,7 +227,7 @@ EVENT(invalid,
EventNameType_HTMLXUL,
eBasicEventClass)
EVENT(keydown,
NS_KEY_DOWN,
eKeyDown,
EventNameType_HTMLXUL,
eKeyboardEventClass)
EVENT(keypress,

2
dom/events/EventStateManager.cpp
Просмотреть файл

@ -684,7 +684,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
}
// then fall through...
case NS_KEY_BEFORE_DOWN:
case NS_KEY_DOWN:
case eKeyDown:
case NS_KEY_AFTER_DOWN:
case NS_KEY_BEFORE_UP:
case eKeyUp:

4
dom/events/KeyboardEvent.cpp
Просмотреть файл

@ -154,7 +154,7 @@ KeyboardEvent::CharCode()
switch (mEvent->mMessage) {
case NS_KEY_BEFORE_DOWN:
case NS_KEY_DOWN:
case eKeyDown:
case NS_KEY_AFTER_DOWN:
case NS_KEY_BEFORE_UP:
case eKeyUp:
@ -200,7 +200,7 @@ KeyboardEvent::Which()
switch (mEvent->mMessage) {
case NS_KEY_BEFORE_DOWN:
case NS_KEY_DOWN:
case eKeyDown:
case NS_KEY_AFTER_DOWN:
case NS_KEY_BEFORE_UP:
case eKeyUp:

2
dom/events/WheelHandlingHelper.cpp
Просмотреть файл

@ -209,7 +209,7 @@ WheelTransaction::OnEvent(WidgetEvent* aEvent)
}
case eKeyPress:
case eKeyUp:
case NS_KEY_DOWN:
case eKeyDown:
case NS_MOUSE_BUTTON_UP:
case NS_MOUSE_BUTTON_DOWN:
case NS_MOUSE_DOUBLECLICK:

2
dom/ipc/TabChild.cpp
Просмотреть файл

@ -2251,7 +2251,7 @@ TabChild::RecvRealKeyEvent(const WidgetKeyboardEvent& event,
localEvent.widget = mPuppetWidget;
nsEventStatus status = APZCCallbackHelper::DispatchWidgetEvent(localEvent);
if (event.mMessage == NS_KEY_DOWN) {
if (event.mMessage == eKeyDown) {
mIgnoreKeyPressEvent = status == nsEventStatus_eConsumeNoDefault;
}

10
dom/plugins/base/nsPluginInstanceOwner.cpp
Просмотреть файл

@ -1827,7 +1827,7 @@ CocoaEventTypeForEvent(const WidgetGUIEvent& anEvent, nsIFrame* aObjectFrame)
return NPCocoaEventMouseDown;
case NS_MOUSE_BUTTON_UP:
return NPCocoaEventMouseUp;
case NS_KEY_DOWN:
case eKeyDown:
return NPCocoaEventKeyDown;
case eKeyUp:
return NPCocoaEventKeyUp;
@ -1905,14 +1905,14 @@ TranslateToNPCocoaEvent(WidgetGUIEvent* anEvent, nsIFrame* aObjectFrame)
}
break;
}
case NS_KEY_DOWN:
case eKeyDown:
case eKeyUp:
{
WidgetKeyboardEvent* keyEvent = anEvent->AsKeyboardEvent();
// That keyEvent->mPluginTextEventString is non-empty is a signal that we should
// create a text event for the plugin, instead of a key event.
if (anEvent->mMessage == NS_KEY_DOWN &&
if (anEvent->mMessage == eKeyDown &&
!keyEvent->mPluginTextEventString.IsEmpty()) {
cocoaEvent.type = NPCocoaEventTextInput;
const char16_t* pluginTextEventString = keyEvent->mPluginTextEventString.get();
@ -2288,8 +2288,8 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent)
event.state = gdkEvent->state;
switch (anEvent.mMessage)
{
case NS_KEY_DOWN:
// Handle NS_KEY_DOWN for modifier key presses
case eKeyDown:
// Handle eKeyDown for modifier key presses
// For non-modifiers we get eKeyPress
if (gdkEvent->is_modifier)
event.type = XKeyPress;

2
editor/libeditor/nsEditorEventListener.cpp
Просмотреть файл

@ -392,7 +392,7 @@ nsEditorEventListener::HandleEvent(nsIDOMEvent* aEvent)
}
#ifdef HANDLE_NATIVE_TEXT_DIRECTION_SWITCH
// keydown
case NS_KEY_DOWN: {
case eKeyDown: {
nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aEvent);
return KeyDown(keyEvent);
}

2
gfx/layers/apz/src/APZCTreeManager.cpp
Просмотреть файл

@ -888,7 +888,7 @@ APZCTreeManager::UpdateWheelTransaction(WidgetInputEvent& aEvent)
}
case eKeyPress:
case eKeyUp:
case NS_KEY_DOWN:
case eKeyDown:
case NS_MOUSE_BUTTON_UP:
case NS_MOUSE_BUTTON_DOWN:
case NS_MOUSE_DOUBLECLICK:

2
layout/base/AccessibleCaretEventHub.cpp
Просмотреть файл

@ -611,7 +611,7 @@ AccessibleCaretEventHub::HandleKeyboardEvent(WidgetKeyboardEvent* aEvent)
{
switch (aEvent->mMessage) {
case eKeyUp:
case NS_KEY_DOWN:
case eKeyDown:
case eKeyPress:
mManager->OnKeyboardEvent();
break;

2
layout/base/TouchCaret.cpp
Просмотреть файл

@ -784,7 +784,7 @@ TouchCaret::HandleEvent(WidgetEvent* aEvent)
LaunchExpirationTimer();
break;
case eKeyUp:
case NS_KEY_DOWN:
case eKeyDown:
case eKeyPress:
case NS_WHEEL_WHEEL:
case NS_WHEEL_START:

17
layout/base/nsPresShell.cpp
Просмотреть файл

@ -6847,7 +6847,7 @@ PresShell::DispatchBeforeKeyboardEventInternal(const nsTArray<nsCOMPtr<Element>
}
EventMessage message =
(aEvent.mMessage == NS_KEY_DOWN) ? NS_KEY_BEFORE_DOWN : NS_KEY_BEFORE_UP;
(aEvent.mMessage == eKeyDown) ? NS_KEY_BEFORE_DOWN : NS_KEY_BEFORE_UP;
nsCOMPtr<EventTarget> eventTarget;
// Dispatch before events from the outermost element.
for (int32_t i = length - 1; i >= 0; i--) {
@ -6881,7 +6881,7 @@ PresShell::DispatchAfterKeyboardEventInternal(const nsTArray<nsCOMPtr<Element> >
}
EventMessage message =
(aEvent.mMessage == NS_KEY_DOWN) ? NS_KEY_AFTER_DOWN : NS_KEY_AFTER_UP;
(aEvent.mMessage == eKeyDown) ? NS_KEY_AFTER_DOWN : NS_KEY_AFTER_UP;
bool embeddedCancelled = aEmbeddedCancelled;
nsCOMPtr<EventTarget> eventTarget;
// Dispatch after events from the innermost element.
@ -6908,8 +6908,7 @@ PresShell::DispatchAfterKeyboardEvent(nsINode* aTarget,
MOZ_ASSERT(aTarget);
MOZ_ASSERT(BeforeAfterKeyboardEventEnabled());
if (NS_WARN_IF(aEvent.mMessage != NS_KEY_DOWN &&
aEvent.mMessage != eKeyUp)) {
if (NS_WARN_IF(aEvent.mMessage != eKeyDown && aEvent.mMessage != eKeyUp)) {
return;
}
@ -6946,7 +6945,7 @@ PresShell::HandleKeyboardEvent(nsINode* aTarget,
}
MOZ_ASSERT(aTarget);
MOZ_ASSERT(aEvent.mMessage == NS_KEY_DOWN || aEvent.mMessage == eKeyUp);
MOZ_ASSERT(aEvent.mMessage == eKeyDown || aEvent.mMessage == eKeyUp);
// Build up a target chain. Each item in the chain will receive a before event.
nsAutoTArray<nsCOMPtr<Element>, 5> chain;
@ -7201,7 +7200,7 @@ PresShell::HandleEvent(nsIFrame* aFrame,
if (aEvent->mClass == eKeyboardEventClass &&
mDocument && mDocument->EventHandlingSuppressed()) {
if (aEvent->mMessage == NS_KEY_DOWN) {
if (aEvent->mMessage == eKeyDown) {
mNoDelayedKeyEvents = true;
} else if (!mNoDelayedKeyEvents) {
DelayedEvent* event = new DelayedKeyEvent(aEvent->AsKeyboardEvent());
@ -7633,7 +7632,7 @@ PresShell::HandleEvent(nsIFrame* aFrame,
}
}
if (aEvent->mMessage == NS_KEY_DOWN) {
if (aEvent->mMessage == eKeyDown) {
NS_IF_RELEASE(gKeyDownTarget);
NS_IF_ADDREF(gKeyDownTarget = eventTarget);
}
@ -7844,7 +7843,7 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent, nsEventStatus* aStatus)
if (aEvent->mFlags.mIsTrusted) {
switch (aEvent->mMessage) {
case eKeyPress:
case NS_KEY_DOWN:
case eKeyDown:
case eKeyUp: {
nsIDocument* doc = GetCurrentEventContent() ?
mCurrentEventContent->OwnerDoc() : nullptr;
@ -7979,7 +7978,7 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent, nsEventStatus* aStatus)
switch (aEvent->mMessage) {
case eKeyPress:
case NS_KEY_DOWN:
case eKeyDown:
case eKeyUp: {
if (aEvent->AsKeyboardEvent()->keyCode == NS_VK_ESCAPE) {
if (aEvent->mMessage == eKeyUp) {

6
layout/printing/nsPrintPreviewListener.cpp
Просмотреть файл

@ -118,7 +118,7 @@ GetActionForEvent(nsIDOMEvent* aEvent)
}
if (keyEvent->mFlags.mInSystemGroup) {
NS_ASSERTION(keyEvent->mMessage == NS_KEY_DOWN,
NS_ASSERTION(keyEvent->mMessage == eKeyDown,
"Assuming we're listening only keydown event in system group");
return eEventAction_StopPropagation;
}
@ -126,8 +126,8 @@ GetActionForEvent(nsIDOMEvent* aEvent)
if (keyEvent->IsAlt() || keyEvent->IsControl() || keyEvent->IsMeta()) {
// Don't consume keydown event because following keypress event may be
// handled as access key or shortcut key.
return (keyEvent->mMessage == NS_KEY_DOWN) ? eEventAction_StopPropagation :
eEventAction_Suppress;
return (keyEvent->mMessage == eKeyDown) ? eEventAction_StopPropagation :
eEventAction_Suppress;
}
static const uint32_t kOKKeyCodes[] = {

2
layout/xul/nsButtonBoxFrame.cpp
Просмотреть файл

@ -111,7 +111,7 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
}
switch (aEvent->mMessage) {
case NS_KEY_DOWN: {
case eKeyDown: {
WidgetKeyboardEvent* keyEvent = aEvent->AsKeyboardEvent();
if (!keyEvent) {
break;

2
widget/EventMessageList.h
Просмотреть файл

@ -21,7 +21,7 @@ NS_EVENT_MESSAGE(eWindowClose, eWindowEventFirst + 1)
NS_EVENT_MESSAGE(eKeyPress, eWindowEventFirst + 31)
NS_EVENT_MESSAGE(eKeyUp, eWindowEventFirst + 32)
NS_EVENT_MESSAGE(NS_KEY_DOWN, eWindowEventFirst + 33)
NS_EVENT_MESSAGE(eKeyDown, eWindowEventFirst + 33)
NS_EVENT_MESSAGE(NS_KEY_BEFORE_DOWN, eWindowEventFirst + 34)
NS_EVENT_MESSAGE(NS_KEY_AFTER_DOWN, eWindowEventFirst + 35)

6
widget/TextEventDispatcher.cpp
Просмотреть файл

@ -319,7 +319,7 @@ TextEventDispatcher::DispatchKeyboardEventInternal(
DispatchTo aDispatchTo,
uint32_t aIndexOfKeypress)
{
MOZ_ASSERT(aMessage == NS_KEY_DOWN || aMessage == eKeyUp ||
MOZ_ASSERT(aMessage == eKeyDown || aMessage == eKeyUp ||
aMessage == eKeyPress, "Invalid aMessage value");
nsresult rv = GetState();
if (NS_WARN_IF(NS_FAILED(rv))) {
@ -356,9 +356,9 @@ TextEventDispatcher::DispatchKeyboardEventInternal(
}
// Corrects each member for the specific key event type.
if (aMessage == NS_KEY_DOWN || aMessage == eKeyUp) {
if (aMessage == eKeyDown || aMessage == eKeyUp) {
MOZ_ASSERT(!aIndexOfKeypress,
"aIndexOfKeypress must be 0 for either NS_KEY_DOWN or eKeyUp");
"aIndexOfKeypress must be 0 for either eKeyDown or eKeyUp");
// charCode of keydown and keyup should be 0.
keyEvent.charCode = 0;
} else if (keyEvent.mKeyNameIndex != KEY_NAME_INDEX_USE_STRING) {

4
widget/TextEventDispatcher.h
Просмотреть файл

@ -203,7 +203,7 @@ public:
/**
* DispatchKeyboardEvent() maybe dispatches aKeyboardEvent.
*
* @param aMessage Must be NS_KEY_DOWN or eKeyUp.
* @param aMessage Must be eKeyDown or eKeyUp.
* Use MaybeDispatchKeypressEvents() for dispatching
* eKeyPress.
* @param aKeyboardEvent A keyboard event.
@ -335,7 +335,7 @@ private:
/**
* DispatchKeyboardEventInternal() maybe dispatches aKeyboardEvent.
*
* @param aMessage Must be NS_KEY_DOWN, eKeyUp or eKeyPress.
* @param aMessage Must be eKeyDown, eKeyUp or eKeyPress.
* @param aKeyboardEvent A keyboard event. If aMessage is eKeyPress and
* the event is for second or later character, its
* mKeyValue should be empty string.

2
widget/WidgetEventImpl.cpp
Просмотреть файл

@ -119,7 +119,7 @@ bool
WidgetEvent::HasKeyEventMessage() const
{
switch (mMessage) {
case NS_KEY_DOWN:
case eKeyDown:
case eKeyPress:
case eKeyUp:
case NS_KEY_BEFORE_DOWN:

10
widget/android/nsWindow.cpp
Просмотреть файл

@ -1473,13 +1473,13 @@ nsWindow::InitKeyEvent(WidgetKeyboardEvent& event, AndroidGeckoEvent& key,
event.mPluginEvent.Clear();
} else {
#ifdef DEBUG
if (event.mMessage != NS_KEY_DOWN && event.mMessage != eKeyUp) {
if (event.mMessage != eKeyDown && event.mMessage != eKeyUp) {
ALOG("InitKeyEvent: unexpected event.mMessage %d", event.mMessage);
}
#endif // DEBUG
// Flash will want a pluginEvent for keydown and keyup events.
ANPKeyActions action = event.mMessage == NS_KEY_DOWN
ANPKeyActions action = event.mMessage == eKeyDown
? kDown_ANPKeyAction
: kUp_ANPKeyAction;
InitPluginEvent(pluginEvent, action, key);
@ -1506,7 +1506,7 @@ nsWindow::InitKeyEvent(WidgetKeyboardEvent& event, AndroidGeckoEvent& key,
}
event.mIsRepeat =
(event.mMessage == NS_KEY_DOWN || event.mMessage == eKeyPress) &&
(event.mMessage == eKeyDown || event.mMessage == eKeyPress) &&
(!!(key.Flags() & AKEY_EVENT_FLAG_LONG_PRESS) || !!key.RepeatCount());
event.location =
WidgetKeyboardEvent::ComputeLocationFromCodeValue(event.mCodeNameIndex);
@ -1580,7 +1580,7 @@ nsWindow::OnKeyEvent(AndroidGeckoEvent *ae)
EventMessage msg;
switch (ae->Action()) {
case AKEY_EVENT_ACTION_DOWN:
msg = NS_KEY_DOWN;
msg = eKeyDown;
break;
case AKEY_EVENT_ACTION_UP:
msg = eKeyUp;
@ -1697,7 +1697,7 @@ nsWindow::RemoveIMEComposition()
void
nsWindow::SendIMEDummyKeyEvents()
{
WidgetKeyboardEvent downEvent(true, NS_KEY_DOWN, this);
WidgetKeyboardEvent downEvent(true, eKeyDown, this);
MOZ_ASSERT(downEvent.keyCode == 0);
DispatchEvent(&downEvent);

8
widget/cocoa/TextInputHandler.mm
Просмотреть файл

@ -226,7 +226,7 @@ static const char*
GetGeckoKeyEventType(const WidgetEvent& aEvent)
{
switch (aEvent.mMessage) {
case NS_KEY_DOWN: return "NS_KEY_DOWN";
case eKeyDown: return "eKeyDown";
case eKeyUp: return "eKeyUp";
case eKeyPress: return "eKeyPress";
default: return "not key event";
@ -1521,7 +1521,7 @@ TextInputHandler::HandleKeyDownEvent(NSEvent* aNativeEvent)
nsAutoString committed;
ctiPanel->InterpretKeyEvent(aNativeEvent, committed);
if (!committed.IsEmpty()) {
WidgetKeyboardEvent imeEvent(true, NS_KEY_DOWN, mWidget);
WidgetKeyboardEvent imeEvent(true, eKeyDown, mWidget);
InitKeyEvent(aNativeEvent, imeEvent);
imeEvent.mPluginTextEventString.Assign(committed);
DispatchEvent(imeEvent);
@ -1532,7 +1532,7 @@ TextInputHandler::HandleKeyDownEvent(NSEvent* aNativeEvent)
if (mWidget->IsPluginFocused() || !IsIMEComposing()) {
NSResponder* firstResponder = [[mView window] firstResponder];
WidgetKeyboardEvent keydownEvent(true, NS_KEY_DOWN, mWidget);
WidgetKeyboardEvent keydownEvent(true, eKeyDown, mWidget);
InitKeyEvent(aNativeEvent, keydownEvent);
currentKeyEvent->mKeyDownHandled = DispatchEvent(keydownEvent);
@ -2006,7 +2006,7 @@ TextInputHandler::DispatchKeyEventForFlagsChanged(NSEvent* aNativeEvent,
return;
}
EventMessage message = aDispatchKeyDown ? NS_KEY_DOWN : eKeyUp;
EventMessage message = aDispatchKeyDown ? eKeyDown : eKeyUp;
// Fire a key event.
WidgetKeyboardEvent keyEvent(true, message, mWidget);

2
widget/gonk/nsAppShell.cpp
Просмотреть файл

@ -341,7 +341,7 @@ KeyEventDispatcher::Dispatch()
void
KeyEventDispatcher::DispatchKeyDownEvent()
{
nsEventStatus status = DispatchKeyEventInternal(NS_KEY_DOWN);
nsEventStatus status = DispatchKeyEventInternal(eKeyDown);
if (status != nsEventStatus_eConsumeNoDefault) {
DispatchKeyEventInternal(eKeyPress);
}

5
widget/gtk/nsGtkKeyUtils.cpp
Просмотреть файл

@ -983,9 +983,8 @@ KeymapWrapper::InitKeyEvent(WidgetKeyboardEvent& aKeyEvent,
aGdkKeyEvent->keyval, aGdkKeyEvent->state,
aGdkKeyEvent->hardware_keycode,
GetBoolName(aGdkKeyEvent->is_modifier),
((aKeyEvent.mMessage == NS_KEY_DOWN) ? "NS_KEY_DOWN" :
(aKeyEvent.mMessage == eKeyPress) ? "eKeyPress" :
"eKeyUp"),
((aKeyEvent.mMessage == eKeyDown) ? "eKeyDown" :
(aKeyEvent.mMessage == eKeyPress) ? "eKeyPress" : "eKeyUp"),
GetBoolName(aKeyEvent.IsShift()), GetBoolName(aKeyEvent.IsControl()),
GetBoolName(aKeyEvent.IsAlt()), GetBoolName(aKeyEvent.IsMeta())));

2
widget/gtk/nsWindow.cpp
Просмотреть файл

@ -2925,7 +2925,7 @@ nsWindow::DispatchKeyDownEvent(GdkEventKey *aEvent, bool *aCancelled)
}
// send the key down event
WidgetKeyboardEvent downEvent(true, NS_KEY_DOWN, this);
WidgetKeyboardEvent downEvent(true, eKeyDown, this);
KeymapWrapper::InitKeyEvent(downEvent, aEvent);
nsEventStatus status = DispatchInputEvent(&downEvent);
*aCancelled = (status == nsEventStatus_eConsumeNoDefault);

2
widget/nsBaseWidget.cpp
Просмотреть файл

@ -2644,7 +2644,7 @@ case _value: eventName.AssignLiteral(_name) ; break
_ASSIGN_eventName(NS_FORM_SUBMIT,"NS_FORM_SUBMIT");
_ASSIGN_eventName(NS_IMAGE_ABORT,"NS_IMAGE_ABORT");
_ASSIGN_eventName(NS_LOAD_ERROR,"NS_LOAD_ERROR");
_ASSIGN_eventName(NS_KEY_DOWN,"NS_KEY_DOWN");
_ASSIGN_eventName(eKeyDown,"eKeyDown");
_ASSIGN_eventName(eKeyPress,"eKeyPress");
_ASSIGN_eventName(eKeyUp,"eKeyUp");
_ASSIGN_eventName(NS_MOUSE_ENTER_WIDGET,"NS_MOUSE_ENTER_WIDGET");

4
widget/qt/nsWindow.cpp
Просмотреть файл

@ -1100,7 +1100,7 @@ InitKeyEvent(WidgetKeyboardEvent& aEvent, QKeyEvent* aQEvent)
aQEvent->modifiers() & Qt::MetaModifier);
aEvent.mIsRepeat =
(aEvent.mMessage == NS_KEY_DOWN || aEvent.mMessage == eKeyPress) &&
(aEvent.mMessage == eKeyDown || aEvent.mMessage == eKeyPress) &&
aQEvent->isAutoRepeat();
aEvent.time = 0;
@ -1156,7 +1156,7 @@ nsWindow::keyPressEvent(QKeyEvent* aEvent)
if (!aEvent->isAutoRepeat() && !IsKeyDown(domKeyCode)) {
SetKeyDownFlag(domKeyCode);
WidgetKeyboardEvent downEvent(true, NS_KEY_DOWN, this);
WidgetKeyboardEvent downEvent(true, eKeyDown, this);
InitKeyEvent(downEvent, aEvent);
nsEventStatus status = DispatchEvent(&downEvent);

6
widget/windows/KeyboardLayout.cpp
Просмотреть файл

@ -1144,7 +1144,7 @@ NativeKey::InitKeyEvent(WidgetKeyboardEvent& aKeyEvent,
mWidget->InitEvent(aKeyEvent, &point);
switch (aKeyEvent.mMessage) {
case NS_KEY_DOWN:
case eKeyDown:
aKeyEvent.keyCode = mDOMKeyCode;
// Unique id for this keydown event and its associated keypress.
sUniqueKeyEventId++;
@ -1308,7 +1308,7 @@ NativeKey::HandleAppCommandMessage() const
bool consumed = false;
if (dispatchKeyEvent) {
WidgetKeyboardEvent keydownEvent(true, NS_KEY_DOWN, mWidget);
WidgetKeyboardEvent keydownEvent(true, eKeyDown, mWidget);
InitKeyEvent(keydownEvent, mModKeyState);
// NOTE: If the keydown event is consumed by web contents, we shouldn't
// continue to handle the command.
@ -1425,7 +1425,7 @@ NativeKey::HandleKeyDownMessage(bool* aEventDispatched) const
}
bool isIMEEnabled = WinUtils::IsIMEEnabled(mWidget->GetInputContext());
WidgetKeyboardEvent keydownEvent(true, NS_KEY_DOWN, mWidget);
WidgetKeyboardEvent keydownEvent(true, eKeyDown, mWidget);
InitKeyEvent(keydownEvent, mModKeyState);
if (aEventDispatched) {
*aEventDispatched = true;

2
widget/windows/KeyboardLayout.h
Просмотреть файл

@ -643,7 +643,7 @@ public:
/*
* If a window receives WM_KEYDOWN message or WM_SYSKEYDOWM message which is
* a redirected message, NativeKey::DispatchKeyDownAndKeyPressEvent()
* prevents to dispatch NS_KEY_DOWN event because it has been dispatched
* prevents to dispatch eKeyDown event because it has been dispatched
* before the message was redirected. However, in some cases, WM_*KEYDOWN
* message handler may not handle actually. Then, the message handler needs
* to forget the redirected message and remove WM_CHAR message or WM_SYSCHAR