Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1046101 part.22 Rename NS_FOCUS_EVENT to eFocusEventClass r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2014-08-04 14:28:54 +09:00
parent 3eb2fc2dd8
commit 2949e98f35
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/events/Event.cpp
View File

@ -177,7 +177,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Event)
case NS_MUTATION_EVENT:
tmp->mEvent->AsMutationEvent()->mRelatedNode = nullptr;
break;
case NS_FOCUS_EVENT:
case eFocusEventClass:
tmp->mEvent->AsFocusEvent()->relatedTarget = nullptr;
break;
default:
@ -220,7 +220,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mRelatedNode");
cb.NoteXPCOMChild(tmp->mEvent->AsMutationEvent()->mRelatedNode);
break;
case NS_FOCUS_EVENT:
case eFocusEventClass:
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->relatedTarget");
cb.NoteXPCOMChild(tmp->mEvent->AsFocusEvent()->relatedTarget);
break;

2
dom/events/EventDispatcher.cpp
View File

@ -705,7 +705,7 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
case eMouseEventClass:
return NS_NewDOMMouseEvent(aDOMEvent, aOwner, aPresContext,
aEvent->AsMouseEvent());
case NS_FOCUS_EVENT:
case eFocusEventClass:
return NS_NewDOMFocusEvent(aDOMEvent, aOwner, aPresContext,
aEvent->AsFocusEvent());
case eMouseScrollEventClass:

4
dom/events/EventNameList.h
View File

@ -429,7 +429,7 @@ EVENT(afterscriptexecute,
FORWARDED_EVENT(blur,
NS_BLUR_CONTENT,
EventNameType_HTMLXUL,
NS_FOCUS_EVENT)
eFocusEventClass)
ERROR_EVENT(error,
NS_LOAD_ERROR,
EventNameType_All,
@ -437,7 +437,7 @@ ERROR_EVENT(error,
FORWARDED_EVENT(focus,
NS_FOCUS_CONTENT,
EventNameType_HTMLXUL,
NS_FOCUS_EVENT)
eFocusEventClass)
FORWARDED_EVENT(load,
NS_LOAD,
EventNameType_All,

2
widget/BasicEvents.h
View File

@ -55,7 +55,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
eScrollPortEventClass, // InternalScrollPortEvent
eScrollAreaEventClass, // InternalScrollAreaEvent
eFormEventClass, // InternalFormEvent
NS_FOCUS_EVENT, // InternalFocusEvent
eFocusEventClass, // InternalFocusEvent
NS_CLIPBOARD_EVENT, // InternalClipboardEvent
NS_TRANSITION_EVENT, // InternalTransitionEvent
NS_ANIMATION_EVENT, // InternalAnimationEvent

9
widget/ContentEvents.h
View File

@ -194,15 +194,16 @@ class InternalFocusEvent : public InternalUIEvent
public:
virtual InternalFocusEvent* AsFocusEvent() MOZ_OVERRIDE { return this; }
InternalFocusEvent(bool aIsTrusted, uint32_t aMessage) :
InternalUIEvent(aIsTrusted, aMessage, NS_FOCUS_EVENT),
fromRaise(false), isRefocus(false)
InternalFocusEvent(bool aIsTrusted, uint32_t aMessage)
: InternalUIEvent(aIsTrusted, aMessage, eFocusEventClass)
, fromRaise(false)
, isRefocus(false)
{
}
virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
{
MOZ_ASSERT(mClass == NS_FOCUS_EVENT,
MOZ_ASSERT(mClass == eFocusEventClass,
"Duplicate() must be overridden by sub class");
InternalFocusEvent* result = new InternalFocusEvent(false, message);
result->AssignFocusEventData(*this, true);