Bug 1046101 part.31 Rename NS_MUTATION_EVENT to eMutationEventClass r=smaug

This commit is contained in:
Masayuki Nakano 2014-08-04 14:28:57 +09:00
Родитель 8bfd290f62
Коммит d07040e4ef
7 изменённых файлов: 17 добавлений и 17 удалений

Просмотреть файл

@ -814,7 +814,7 @@ nsIContent::PreHandleEvent(EventChainPreVisitor& aVisitor)
// all the events are allowed even in the native anonymous content.. // all the events are allowed even in the native anonymous content..
nsCOMPtr<nsIContent> t = do_QueryInterface(aVisitor.mEvent->originalTarget); nsCOMPtr<nsIContent> t = do_QueryInterface(aVisitor.mEvent->originalTarget);
NS_ASSERTION(!t || !t->ChromeOnlyAccess() || NS_ASSERTION(!t || !t->ChromeOnlyAccess() ||
aVisitor.mEvent->mClass != NS_MUTATION_EVENT || aVisitor.mEvent->mClass != eMutationEventClass ||
aVisitor.mDOMEvent, aVisitor.mDOMEvent,
"Mutation event dispatched in native anonymous content!?!"); "Mutation event dispatched in native anonymous content!?!");
#endif #endif

Просмотреть файл

@ -3251,7 +3251,7 @@ HTMLInputElement::NeedToInitializeEditorForEvent(
// handled without the editor being initialized. These events include: // handled without the editor being initialized. These events include:
// mousein/move/out, overflow/underflow, and DOM mutation events. // mousein/move/out, overflow/underflow, and DOM mutation events.
if (!IsSingleLineTextControl(false) || if (!IsSingleLineTextControl(false) ||
aVisitor.mEvent->mClass == NS_MUTATION_EVENT) { aVisitor.mEvent->mClass == eMutationEventClass) {
return false; return false;
} }

Просмотреть файл

@ -174,7 +174,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Event)
case eClipboardEventClass: case eClipboardEventClass:
tmp->mEvent->AsClipboardEvent()->clipboardData = nullptr; tmp->mEvent->AsClipboardEvent()->clipboardData = nullptr;
break; break;
case NS_MUTATION_EVENT: case eMutationEventClass:
tmp->mEvent->AsMutationEvent()->mRelatedNode = nullptr; tmp->mEvent->AsMutationEvent()->mRelatedNode = nullptr;
break; break;
case eFocusEventClass: case eFocusEventClass:
@ -216,7 +216,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->clipboardData"); NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->clipboardData");
cb.NoteXPCOMChild(tmp->mEvent->AsClipboardEvent()->clipboardData); cb.NoteXPCOMChild(tmp->mEvent->AsClipboardEvent()->clipboardData);
break; break;
case NS_MUTATION_EVENT: case eMutationEventClass:
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mRelatedNode"); NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mRelatedNode");
cb.NoteXPCOMChild(tmp->mEvent->AsMutationEvent()->mRelatedNode); cb.NoteXPCOMChild(tmp->mEvent->AsMutationEvent()->mRelatedNode);
break; break;

Просмотреть файл

@ -685,7 +685,7 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
if (aEvent) { if (aEvent) {
switch(aEvent->mClass) { switch(aEvent->mClass) {
case NS_MUTATION_EVENT: case eMutationEventClass:
return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext, return NS_NewDOMMutationEvent(aDOMEvent, aOwner, aPresContext,
aEvent->AsMutationEvent()); aEvent->AsMutationEvent());
case eGUIEventClass: case eGUIEventClass:

Просмотреть файл

@ -577,31 +577,31 @@ NON_IDL_EVENT(MozMouseHittest,
NON_IDL_EVENT(DOMAttrModified, NON_IDL_EVENT(DOMAttrModified,
NS_MUTATION_ATTRMODIFIED, NS_MUTATION_ATTRMODIFIED,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMCharacterDataModified, NON_IDL_EVENT(DOMCharacterDataModified,
NS_MUTATION_CHARACTERDATAMODIFIED, NS_MUTATION_CHARACTERDATAMODIFIED,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMNodeInserted, NON_IDL_EVENT(DOMNodeInserted,
NS_MUTATION_NODEINSERTED, NS_MUTATION_NODEINSERTED,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMNodeRemoved, NON_IDL_EVENT(DOMNodeRemoved,
NS_MUTATION_NODEREMOVED, NS_MUTATION_NODEREMOVED,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMNodeInsertedIntoDocument, NON_IDL_EVENT(DOMNodeInsertedIntoDocument,
NS_MUTATION_NODEINSERTEDINTODOCUMENT, NS_MUTATION_NODEINSERTEDINTODOCUMENT,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMNodeRemovedFromDocument, NON_IDL_EVENT(DOMNodeRemovedFromDocument,
NS_MUTATION_NODEREMOVEDFROMDOCUMENT, NS_MUTATION_NODEREMOVEDFROMDOCUMENT,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMSubtreeModified, NON_IDL_EVENT(DOMSubtreeModified,
NS_MUTATION_SUBTREEMODIFIED, NS_MUTATION_SUBTREEMODIFIED,
EventNameType_HTMLXUL, EventNameType_HTMLXUL,
NS_MUTATION_EVENT) eMutationEventClass)
NON_IDL_EVENT(DOMActivate, NON_IDL_EVENT(DOMActivate,
NS_UI_ACTIVATE, NS_UI_ACTIVATE,

Просмотреть файл

@ -18,16 +18,16 @@ class InternalMutationEvent : public WidgetEvent
public: public:
virtual InternalMutationEvent* AsMutationEvent() MOZ_OVERRIDE { return this; } virtual InternalMutationEvent* AsMutationEvent() MOZ_OVERRIDE { return this; }
InternalMutationEvent(bool aIsTrusted, uint32_t aMessage) : InternalMutationEvent(bool aIsTrusted, uint32_t aMessage)
WidgetEvent(aIsTrusted, aMessage, NS_MUTATION_EVENT), : WidgetEvent(aIsTrusted, aMessage, eMutationEventClass)
mAttrChange(0) , mAttrChange(0)
{ {
mFlags.mCancelable = false; mFlags.mCancelable = false;
} }
virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE virtual WidgetEvent* Duplicate() const MOZ_OVERRIDE
{ {
MOZ_ASSERT(mClass == NS_MUTATION_EVENT, MOZ_ASSERT(mClass == eMutationEventClass,
"Duplicate() must be overridden by sub class"); "Duplicate() must be overridden by sub class");
InternalMutationEvent* result = new InternalMutationEvent(false, message); InternalMutationEvent* result = new InternalMutationEvent(false, message);
result->AssignMutationEventData(*this, true); result->AssignMutationEventData(*this, true);

Просмотреть файл

@ -68,7 +68,7 @@ enum EventClassID MOZ_ENUM_TYPE(EventClassIDType)
ePluginEventClass, // WidgetPluginEvent ePluginEventClass, // WidgetPluginEvent
// InternalMutationEvent.h (dom/events) // InternalMutationEvent.h (dom/events)
NS_MUTATION_EVENT // InternalMutationEvent eMutationEventClass // InternalMutationEvent
}; };
} // namespace mozilla } // namespace mozilla