diff --git a/accessible/src/base/DocManager.cpp b/accessible/src/base/DocManager.cpp index 7a2db75fd954..d5a91e09b4b3 100644 --- a/accessible/src/base/DocManager.cpp +++ b/accessible/src/base/DocManager.cpp @@ -331,7 +331,7 @@ DocManager::AddListeners(nsIDocument* aDocument, EventTarget* target = window->GetChromeEventHandler(); nsEventListenerManager* elm = target->GetOrCreateListenerManager(); elm->AddEventListenerByType(this, NS_LITERAL_STRING("pagehide"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); #ifdef A11Y_LOG if (logging::IsEnabled(logging::eDocCreate)) @@ -340,7 +340,7 @@ DocManager::AddListeners(nsIDocument* aDocument, if (aAddDOMContentLoadedListener) { elm->AddEventListenerByType(this, NS_LITERAL_STRING("DOMContentLoaded"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); #ifdef A11Y_LOG if (logging::IsEnabled(logging::eDocCreate)) logging::Text("added 'DOMContentLoaded' listener"); @@ -361,10 +361,10 @@ DocManager::RemoveListeners(nsIDocument* aDocument) nsEventListenerManager* elm = target->GetOrCreateListenerManager(); elm->RemoveEventListenerByType(this, NS_LITERAL_STRING("pagehide"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elm->RemoveEventListenerByType(this, NS_LITERAL_STRING("DOMContentLoaded"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); } DocAccessible* diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 105ce5292875..2d9ed6b9d1fe 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -2161,7 +2161,7 @@ nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult eventTarget->GetOrCreateListenerManager(); manager->AddEventListenerByType(new nsXHRParseEndListener(this), NS_LITERAL_STRING("DOMContentLoaded"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); return NS_OK; } // We might have been sent non-XML data. If that was the case, diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp index 267a3a3961c0..beeebf6b33cf 100644 --- a/content/html/content/src/nsTextEditorState.cpp +++ b/content/html/content/src/nsTextEditorState.cpp @@ -1529,13 +1529,13 @@ nsTextEditorState::UnbindFromFrame(nsTextControlFrame* aFrame) if (manager) { manager->RemoveEventListenerByType(mTextListener, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->RemoveEventListenerByType(mTextListener, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->RemoveEventListenerByType(mTextListener, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } NS_RELEASE(mTextListener); @@ -1934,13 +1934,13 @@ nsTextEditorState::InitializeKeyboardEventListeners() if (manager) { manager->AddEventListenerByType(mTextListener, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->AddEventListenerByType(mTextListener, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->AddEventListenerByType(mTextListener, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } mSelCon->SetScrollableFrame(do_QueryFrame(mBoundFrame->GetFirstPrincipalChild())); diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index a4631ba7a290..9bac8fc582fc 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -1686,11 +1686,11 @@ nsXULElement::AddPopupListener(nsIAtom* aName) if (isContext) { manager->AddEventListenerByType(listener, NS_LITERAL_STRING("contextmenu"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } else { manager->AddEventListenerByType(listener, NS_LITERAL_STRING("mousedown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } return NS_OK; } diff --git a/dom/events/nsEventListenerManager.h b/dom/events/nsEventListenerManager.h index baef32ad64a8..355246ee8205 100644 --- a/dom/events/nsEventListenerManager.h +++ b/dom/events/nsEventListenerManager.h @@ -28,13 +28,14 @@ class nsEventListenerManager; template class nsCOMArray; namespace mozilla { -namespace dom { +namespace dom { class EventTarget; class Element; +} // namespace dom -typedef CallbackObjectHolder - EventListenerHolder; +typedef dom::CallbackObjectHolder EventListenerHolder; struct EventListenerFlags { @@ -142,7 +143,6 @@ inline EventListenerFlags AllEventsAtSystemGroupCapture() return flags; } -} // namespace dom } // namespace mozilla /* @@ -154,7 +154,7 @@ class nsEventListenerManager public: struct Listener { - mozilla::dom::EventListenerHolder mListener; + mozilla::EventListenerHolder mListener; nsCOMPtr mTypeAtom; // for the main thread nsString mTypeString; // for non-main-threads uint16_t mEventType; @@ -173,7 +173,7 @@ public: bool mHandlerIsString : 1; bool mAllEvents : 1; - mozilla::dom::EventListenerFlags mFlags; + mozilla::EventListenerFlags mFlags; nsIJSEventListener* GetJSListener() const { @@ -221,7 +221,7 @@ public: bool aUseCapture, bool aWantsUntrusted) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); AddEventListener(aType, holder, aUseCapture, aWantsUntrusted); } void AddEventListener(const nsAString& aType, @@ -229,21 +229,21 @@ public: bool aUseCapture, bool aWantsUntrusted) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); AddEventListener(aType, holder, aUseCapture, aWantsUntrusted); } void RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, bool aUseCapture) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); RemoveEventListener(aType, holder, aUseCapture); } void RemoveEventListener(const nsAString& aType, mozilla::dom::EventListener* aListener, bool aUseCapture) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); RemoveEventListener(aType, holder, aUseCapture); } @@ -261,24 +261,24 @@ public: */ void AddEventListenerByType(nsIDOMEventListener *aListener, const nsAString& type, - const mozilla::dom::EventListenerFlags& aFlags) + const mozilla::EventListenerFlags& aFlags) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); AddEventListenerByType(holder, type, aFlags); } - void AddEventListenerByType(const mozilla::dom::EventListenerHolder& aListener, + void AddEventListenerByType(const mozilla::EventListenerHolder& aListener, const nsAString& type, - const mozilla::dom::EventListenerFlags& aFlags); + const mozilla::EventListenerFlags& aFlags); void RemoveEventListenerByType(nsIDOMEventListener *aListener, const nsAString& type, - const mozilla::dom::EventListenerFlags& aFlags) + const mozilla::EventListenerFlags& aFlags) { - mozilla::dom::EventListenerHolder holder(aListener); + mozilla::EventListenerHolder holder(aListener); RemoveEventListenerByType(holder, type, aFlags); } - void RemoveEventListenerByType(const mozilla::dom::EventListenerHolder& aListener, + void RemoveEventListenerByType(const mozilla::EventListenerHolder& aListener, const nsAString& type, - const mozilla::dom::EventListenerFlags& aFlags); + const mozilla::EventListenerFlags& aFlags); /** * Sets the current "inline" event listener for aName to be a @@ -510,27 +510,27 @@ protected: const nsAString& aTypeString); void AddEventListener(const nsAString& aType, - const mozilla::dom::EventListenerHolder& aListener, + const mozilla::EventListenerHolder& aListener, bool aUseCapture, bool aWantsUntrusted); void RemoveEventListener(const nsAString& aType, - const mozilla::dom::EventListenerHolder& aListener, + const mozilla::EventListenerHolder& aListener, bool aUseCapture); void AddEventListenerInternal( - const mozilla::dom::EventListenerHolder& aListener, + const mozilla::EventListenerHolder& aListener, uint32_t aType, nsIAtom* aTypeAtom, const nsAString& aTypeString, - const mozilla::dom::EventListenerFlags& aFlags, + const mozilla::EventListenerFlags& aFlags, bool aHandler = false, bool aAllEvents = false); void RemoveEventListenerInternal( - const mozilla::dom::EventListenerHolder& aListener, + const mozilla::EventListenerHolder& aListener, uint32_t aType, nsIAtom* aUserType, const nsAString& aTypeString, - const mozilla::dom::EventListenerFlags& aFlags, + const mozilla::EventListenerFlags& aFlags, bool aAllEvents = false); void RemoveAllListeners(); const EventTypeData* GetTypeDataForIID(const nsIID& aIID); @@ -577,7 +577,7 @@ NS_AddSystemEventListener(mozilla::dom::EventTarget* aTarget, nsEventListenerManager* listenerManager = aTarget->GetOrCreateListenerManager(); NS_ENSURE_STATE(listenerManager); - mozilla::dom::EventListenerFlags flags; + mozilla::EventListenerFlags flags; flags.mInSystemGroup = true; flags.mCapture = aUseCapture; flags.mAllowUntrustedEvents = aWantsUntrusted; diff --git a/dom/interfaces/events/nsIDOMEventTarget.idl b/dom/interfaces/events/nsIDOMEventTarget.idl index c0d892276412..ed73b1faf977 100644 --- a/dom/interfaces/events/nsIDOMEventTarget.idl +++ b/dom/interfaces/events/nsIDOMEventTarget.idl @@ -300,7 +300,7 @@ aClass::RemoveSystemEventListener(const nsAString& aType, \ if (!listenerManager) { \ return NS_OK; \ } \ - mozilla::dom::EventListenerFlags flags; \ + mozilla::EventListenerFlags flags; \ flags.mInSystemGroup = true; \ flags.mCapture = aUseCapture; \ listenerManager->RemoveEventListenerByType(aListener, aType, flags); \ diff --git a/dom/xbl/nsXBLBinding.cpp b/dom/xbl/nsXBLBinding.cpp index 8635bdc9fe54..1a8394afb461 100644 --- a/dom/xbl/nsXBLBinding.cpp +++ b/dom/xbl/nsXBLBinding.cpp @@ -551,7 +551,7 @@ nsXBLBinding::InstallEventHandlers() nsXBLEventHandler* handler = curr->GetEventHandler(); if (handler) { // Figure out if we're using capturing or not. - dom::EventListenerFlags flags; + EventListenerFlags flags; flags.mCapture = (curr->GetPhase() == NS_PHASE_CAPTURING); // If this is a command, add it in the system event group @@ -588,7 +588,7 @@ nsXBLBinding::InstallEventHandlers() // add it to the standard event group. // Figure out if we're using capturing or not. - dom::EventListenerFlags flags; + EventListenerFlags flags; flags.mCapture = (handler->GetPhase() == NS_PHASE_CAPTURING); if ((handler->GetType() & (NS_HANDLER_TYPE_XBL_COMMAND | @@ -702,7 +702,7 @@ nsXBLBinding::UnhookEventHandlers() continue; // Figure out if we're using capturing or not. - dom::EventListenerFlags flags; + EventListenerFlags flags; flags.mCapture = (curr->GetPhase() == NS_PHASE_CAPTURING); // If this is a command, remove it from the system event group, @@ -729,7 +729,7 @@ nsXBLBinding::UnhookEventHandlers() handler->GetEventName(type); // Figure out if we're using capturing or not. - dom::EventListenerFlags flags; + EventListenerFlags flags; flags.mCapture = (handler->GetPhase() == NS_PHASE_CAPTURING); // If this is a command, remove it from the system event group, otherwise diff --git a/dom/xbl/nsXBLService.cpp b/dom/xbl/nsXBLService.cpp index ff2fa1281c6b..1170ab2f2309 100644 --- a/dom/xbl/nsXBLService.cpp +++ b/dom/xbl/nsXBLService.cpp @@ -579,11 +579,11 @@ nsXBLService::AttachGlobalKeyHandler(EventTarget* aTarget) // listen to these events manager->AddEventListenerByType(handler, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->AddEventListenerByType(handler, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->AddEventListenerByType(handler, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); if (contentNode) return contentNode->SetProperty(nsGkAtoms::listener, @@ -624,11 +624,11 @@ nsXBLService::DetachGlobalKeyHandler(EventTarget* aTarget) return NS_ERROR_FAILURE; manager->RemoveEventListenerByType(handler, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->RemoveEventListenerByType(handler, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); manager->RemoveEventListenerByType(handler, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); contentNode->DeleteProperty(nsGkAtoms::listener); diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp index 7f2aef2bcaab..3f202bbf29a0 100644 --- a/editor/libeditor/base/nsEditorEventListener.cpp +++ b/editor/libeditor/base/nsEditorEventListener.cpp @@ -147,26 +147,26 @@ nsEditorEventListener::InstallToEditor() #ifdef HANDLE_NATIVE_TEXT_DIRECTION_SWITCH elmP->AddEventListenerByType(this, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); #endif elmP->AddEventListenerByType(this, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragenter"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragover"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragexit"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("drop"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); // XXX We should add the mouse event listeners as system event group. // E.g., web applications cannot prevent middle mouse paste by // preventDefault() of click event at bubble phase. @@ -174,30 +174,30 @@ nsEditorEventListener::InstallToEditor() // code need to check if it's editable. It makes easier create new bugs. elmP->AddEventListenerByType(this, NS_LITERAL_STRING("mousedown"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("mouseup"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("click"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); // Focus event doesn't bubble so adding the listener to capturing phase. // Make sure this works after bug 235441 gets fixed. elmP->AddEventListenerByType(this, NS_LITERAL_STRING("blur"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("focus"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("text"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("compositionstart"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("compositionend"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); return NS_OK; } @@ -243,50 +243,50 @@ nsEditorEventListener::UninstallFromEditor() #ifdef HANDLE_NATIVE_TEXT_DIRECTION_SWITCH elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("keydown"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("keyup"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); #endif elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("keypress"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("dragenter"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("dragover"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("dragexit"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("drop"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("mousedown"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("mouseup"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("click"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("blur"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("focus"), - dom::TrustedEventsAtCapture()); + TrustedEventsAtCapture()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("text"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("compositionstart"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("compositionend"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } already_AddRefed diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index d9cc265ae1fb..dbc51bb294ce 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -869,9 +869,9 @@ nsDocShellTreeOwner::AddChromeListeners() nsEventListenerManager* elmP = target->GetOrCreateListenerManager(); if (elmP) { elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragover"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->AddEventListenerByType(this, NS_LITERAL_STRING("drop"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } return rv; @@ -900,9 +900,9 @@ nsDocShellTreeOwner::RemoveChromeListeners() if (elmP) { elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("dragover"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); elmP->RemoveEventListenerByType(this, NS_LITERAL_STRING("drop"), - dom::TrustedEventsAtSystemGroupBubble()); + TrustedEventsAtSystemGroupBubble()); } return NS_OK;