Bug 1046101 part.3 Rename NS_INPUT_EVENT to eInputEventClass r=smaug

This commit is contained in:
Masayuki Nakano 2014-08-04 14:28:47 +09:00
parent bddeb1250e
commit e040be3c13
4 changed files with 8 additions and 8 deletions

View File

@ -1289,7 +1289,7 @@ nsXULElement::PreHandleEvent(EventChainPreVisitor& aVisitor)
return NS_OK;
}
if (aVisitor.mEvent->message == NS_XUL_COMMAND &&
aVisitor.mEvent->mClass == NS_INPUT_EVENT &&
aVisitor.mEvent->mClass == eInputEventClass &&
aVisitor.mEvent->originalTarget == static_cast<nsIContent*>(this) &&
tag != nsGkAtoms::command) {
// Check that we really have an xul command event. That will be handled

View File

@ -695,7 +695,7 @@ Event::GetEventPopupControlState(WidgetEvent* aEvent)
}
}
break;
case NS_INPUT_EVENT :
case eInputEventClass:
// For this following event only allow popups if it's triggered
// while handling user input. See
// nsPresShell::HandleEventInternal() for details.

View File

@ -670,7 +670,7 @@ NON_IDL_EVENT(compositionend,
NON_IDL_EVENT(command,
NS_XUL_COMMAND,
EventNameType_XUL,
NS_INPUT_EVENT)
eInputEventClass)
NON_IDL_EVENT(close,
NS_XUL_CLOSE,
EventNameType_XUL,

View File

@ -28,7 +28,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
// BasicEvents.h
NS_EVENT, // WidgetEvent
eGUIEventClass, // WidgetGUIEvent
NS_INPUT_EVENT, // WidgetInputEvent
eInputEventClass, // WidgetInputEvent
NS_UI_EVENT, // InternalUIEvent
// TextEvents.h
@ -1018,15 +1018,15 @@ protected:
public:
virtual WidgetInputEvent* AsInputEvent() MOZ_OVERRIDE { return this; }
WidgetInputEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget) :
WidgetGUIEvent(aIsTrusted, aMessage, aWidget, NS_INPUT_EVENT),
modifiers(0)
WidgetInputEvent(bool aIsTrusted, uint32_t aMessage, nsIWidget* aWidget)
: WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eInputEventClass)
, modifiers(0)
{
}
virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
{
MOZ_ASSERT(mClass == NS_INPUT_EVENT,
MOZ_ASSERT(mClass == eInputEventClass,
"Duplicate() must be overridden by sub class");
// Not copying widget, it is a weak reference.
WidgetInputEvent* result = new WidgetInputEvent(false, message, nullptr);