diff --git a/dom/base/PostMessageEvent.cpp b/dom/base/PostMessageEvent.cpp index a526b479688d7..c78b7e455c840 100644 --- a/dom/base/PostMessageEvent.cpp +++ b/dom/base/PostMessageEvent.cpp @@ -159,7 +159,7 @@ PostMessageEvent::Run() presContext = shell->GetPresContext(); event->SetTrusted(mTrustedCaller); - WidgetEvent* internalEvent = event->GetInternalNSEvent(); + WidgetEvent* internalEvent = event->WidgetEventPtr(); nsEventStatus status = nsEventStatus_eIgnore; EventDispatcher::Dispatch(window, diff --git a/dom/base/TextInputProcessor.cpp b/dom/base/TextInputProcessor.cpp index 5bffdd631da0e..e46d20aeaba49 100644 --- a/dom/base/TextInputProcessor.cpp +++ b/dom/base/TextInputProcessor.cpp @@ -344,7 +344,7 @@ TextInputProcessor::PrepareKeyboardEventForComposition( aKeyboardEvent = aOptionalArgc && aDOMKeyEvent ? - aDOMKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent() : nullptr; + aDOMKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent() : nullptr; if (!aKeyboardEvent || aOptionalArgc < 2) { aKeyFlags = 0; } @@ -769,7 +769,7 @@ TextInputProcessor::Keydown(nsIDOMKeyEvent* aDOMKeyEvent, return NS_ERROR_INVALID_ARG; } WidgetKeyboardEvent* originalKeyEvent = - aDOMKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aDOMKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (NS_WARN_IF(!originalKeyEvent)) { return NS_ERROR_INVALID_ARG; } @@ -875,7 +875,7 @@ TextInputProcessor::Keyup(nsIDOMKeyEvent* aDOMKeyEvent, return NS_ERROR_INVALID_ARG; } WidgetKeyboardEvent* originalKeyEvent = - aDOMKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aDOMKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (NS_WARN_IF(!originalKeyEvent)) { return NS_ERROR_INVALID_ARG; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index ab915ab4c7595..7e7acd2676247 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -3783,7 +3783,7 @@ nsContentUtils::DispatchEvent(nsIDocument* aDoc, nsISupports* aTarget, aCancelable, aTrusted, getter_AddRefs(event), getter_AddRefs(target)); NS_ENSURE_SUCCESS(rv, rv); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = aOnlyChromeDispatch; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = aOnlyChromeDispatch; bool dummy; return target->DispatchEvent(event, aDefaultAction ? aDefaultAction : &dummy); @@ -4947,7 +4947,7 @@ nsContentUtils::GetAccelKeyCandidates(nsIDOMKeyEvent* aDOMKeyEvent, return; WidgetKeyboardEvent* nativeKeyEvent = - aDOMKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aDOMKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (nativeKeyEvent) { NS_ASSERTION(nativeKeyEvent->mClass == eKeyboardEventClass, "wrong type of native event"); diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 3aa9fa9baf65a..2cd3213dbde18 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -1773,7 +1773,7 @@ nsDOMWindowUtils::DispatchDOMEventViaPresShell(nsIDOMNode* aTarget, { NS_ENSURE_STATE(aEvent); aEvent->SetTrusted(aTrusted); - WidgetEvent* internalEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = aEvent->WidgetEventPtr(); NS_ENSURE_STATE(internalEvent); nsCOMPtr content = do_QueryInterface(aTarget); NS_ENSURE_STATE(content); @@ -3456,7 +3456,7 @@ nsDOMWindowUtils::DispatchEventToChromeOnly(nsIDOMEventTarget* aTarget, { *aRetVal = false; NS_ENSURE_STATE(aTarget && aEvent); - aEvent->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + aEvent->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; aTarget->DispatchEvent(aEvent, aRetVal); return NS_OK; } diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 6c6938385b6e2..a62b07b592f4c 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -5095,7 +5095,7 @@ nsDocument::DispatchContentLoadedEvents() // the ancestor document if we used the normal event // dispatching code. - WidgetEvent* innerEvent = event->GetInternalNSEvent(); + WidgetEvent* innerEvent = event->WidgetEventPtr(); if (innerEvent) { nsEventStatus status = nsEventStatus_eIgnore; @@ -8113,7 +8113,7 @@ nsIDocument::CreateEvent(const nsAString& aEventType, ErrorResult& rv) const rv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); return nullptr; } - WidgetEvent* e = ev->GetInternalNSEvent(); + WidgetEvent* e = ev->WidgetEventPtr(); e->mFlags.mBubbles = false; e->mFlags.mCancelable = false; return ev.forget(); @@ -9200,7 +9200,7 @@ DispatchCustomEventWithFlush(nsINode* aTarget, const nsAString& aEventType, event->InitEvent(aEventType, aBubbles, false); event->SetTrusted(true); if (aOnlyChromeDispatch) { - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; } if (nsIPresShell* shell = aTarget->OwnerDoc()->GetShell()) { shell->GetPresContext()-> diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ff32c0a9ddd47..958c0bfa4a7a7 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -5701,7 +5701,7 @@ nsGlobalWindow::DispatchResizeEvent(const CSSIntSize& aSize) } domEvent->SetTrusted(true); - domEvent->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + domEvent->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; nsCOMPtr target = do_QueryInterface(GetOuterWindow()); domEvent->SetTarget(target); @@ -8496,7 +8496,7 @@ nsGlobalWindow::LeaveModalState() RefPtr event = NS_NewDOMEvent(inner, nullptr, nullptr); event->InitEvent(NS_LITERAL_STRING("endmodalstate"), true, false); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; bool dummy; topWin->DispatchEvent(event, &dummy); } @@ -11110,7 +11110,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic, newEvent->SetTrusted(true); if (fireMozStorageChanged) { - WidgetEvent* internalEvent = newEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = newEvent->WidgetEventPtr(); internalEvent->mFlags.mOnlyChromeDispatch = true; } @@ -13243,7 +13243,7 @@ nsGlobalWindow::BeginWindowMove(Event& aMouseDownEvent, Element* aPanel, } WidgetMouseEvent* mouseEvent = - aMouseDownEvent.GetInternalNSEvent()->AsMouseEvent(); + aMouseDownEvent.WidgetEventPtr()->AsMouseEvent(); if (!mouseEvent || mouseEvent->mClass != eMouseEventClass) { aError.Throw(NS_ERROR_FAILURE); return; diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp index 5cb7c0ce62005..2b9fcf0911de5 100644 --- a/dom/base/nsObjectLoadingContent.cpp +++ b/dom/base/nsObjectLoadingContent.cpp @@ -353,7 +353,7 @@ nsPluginCrashedEvent::Run() PluginCrashedEvent::Constructor(doc, NS_LITERAL_STRING("PluginCrashed"), init); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; EventDispatcher::DispatchDOMEvent(mContent, nullptr, event, nullptr, nullptr); return NS_OK; diff --git a/dom/events/AsyncEventDispatcher.cpp b/dom/events/AsyncEventDispatcher.cpp index 0deaa74bff42f..00786636cada6 100644 --- a/dom/events/AsyncEventDispatcher.cpp +++ b/dom/events/AsyncEventDispatcher.cpp @@ -45,7 +45,7 @@ AsyncEventDispatcher::Run() } if (mOnlyChromeDispatch) { MOZ_ASSERT(event->IsTrusted()); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; } bool dummy; mTarget->DispatchEvent(event, &dummy); diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index 90e10a6673a58..8e34d8410901d 100644 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -629,7 +629,7 @@ Event::IsDispatchStopped() } NS_IMETHODIMP_(WidgetEvent*) -Event::GetInternalNSEvent() +Event::WidgetEventPtr() { return mEvent; } diff --git a/dom/events/Event.h b/dom/events/Event.h index 85fb0642d0926..11b219c3ddac7 100644 --- a/dom/events/Event.h +++ b/dom/events/Event.h @@ -359,7 +359,7 @@ class MOZ_STACK_CLASS WantsPopupControlCheck NS_IMETHOD GetIsTrusted(bool* aIsTrusted) override { return _to GetIsTrusted(aIsTrusted); } \ NS_IMETHOD SetTarget(nsIDOMEventTarget* aTarget) override { return _to SetTarget(aTarget); } \ NS_IMETHOD_(bool) IsDispatchStopped(void) override { return _to IsDispatchStopped(); } \ - NS_IMETHOD_(WidgetEvent*) GetInternalNSEvent(void) override { return _to GetInternalNSEvent(); } \ + NS_IMETHOD_(WidgetEvent*) WidgetEventPtr(void) override { return _to WidgetEventPtr(); } \ NS_IMETHOD_(void) SetTrusted(bool aTrusted) override { _to SetTrusted(aTrusted); } \ NS_IMETHOD_(void) SetOwner(EventTarget* aOwner) override { _to SetOwner(aOwner); } \ NS_IMETHOD_(Event*) InternalDOMEvent() override { return _to InternalDOMEvent(); } diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp index 32803d59be4ee..f783f52882f12 100644 --- a/dom/events/EventDispatcher.cpp +++ b/dom/events/EventDispatcher.cpp @@ -509,7 +509,7 @@ EventDispatcher::Dispatch(nsISupports* aTarget, } if (aDOMEvent) { - WidgetEvent* innerEvent = aDOMEvent->GetInternalNSEvent(); + WidgetEvent* innerEvent = aDOMEvent->WidgetEventPtr(); NS_ASSERTION(innerEvent == aEvent, "The inner event of aDOMEvent is not the same as aEvent!"); } @@ -698,7 +698,7 @@ EventDispatcher::DispatchDOMEvent(nsISupports* aTarget, nsEventStatus* aEventStatus) { if (aDOMEvent) { - WidgetEvent* innerEvent = aDOMEvent->GetInternalNSEvent(); + WidgetEvent* innerEvent = aDOMEvent->WidgetEventPtr(); NS_ENSURE_TRUE(innerEvent, NS_ERROR_ILLEGAL_VALUE); bool dontResetTrusted = false; diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index c69376d60a07a..6b907f13001ec 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -584,7 +584,7 @@ IMEStateManager::OnMouseButtonEventInEditor(nsPresContext* aPresContext, } WidgetMouseEvent* internalEvent = - aMouseEvent->AsEvent()->GetInternalNSEvent()->AsMouseEvent(); + aMouseEvent->AsEvent()->WidgetEventPtr()->AsMouseEvent(); if (NS_WARN_IF(!internalEvent)) { MOZ_LOG(sISMLog, LogLevel::Debug, ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " diff --git a/dom/html/nsTextEditorState.cpp b/dom/html/nsTextEditorState.cpp index f37d656a25e3e..cd52a6dbd48fc 100644 --- a/dom/html/nsTextEditorState.cpp +++ b/dom/html/nsTextEditorState.cpp @@ -872,7 +872,7 @@ nsTextInputListener::HandleEvent(nsIDOMEvent* aEvent) } WidgetKeyboardEvent* keyEvent = - aEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aEvent->WidgetEventPtr()->AsKeyboardEvent(); if (!keyEvent) { return NS_ERROR_UNEXPECTED; } diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp index f4fc32b2fc5ff..17d2e01811e1b 100644 --- a/dom/indexedDB/ActorsChild.cpp +++ b/dom/indexedDB/ActorsChild.cpp @@ -743,7 +743,7 @@ DispatchErrorEvent(IDBRequest* aRequest, MOZ_ASSERT(!transaction || transaction->IsOpen() || transaction->IsAborted()); if (transaction && transaction->IsOpen()) { - WidgetEvent* internalEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = aEvent->WidgetEventPtr(); MOZ_ASSERT(internalEvent); if (internalEvent->mFlags.mExceptionHasBeenRisen) { @@ -816,7 +816,7 @@ DispatchSuccessEvent(ResultHelper* aResultHelper, MOZ_ASSERT_IF(transaction, transaction->IsOpen() || transaction->IsAborted()); - WidgetEvent* internalEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = aEvent->WidgetEventPtr(); MOZ_ASSERT(internalEvent); if (transaction && diff --git a/dom/interfaces/events/nsIDOMEvent.idl b/dom/interfaces/events/nsIDOMEvent.idl index 1cd665a07c2c0..786884022c040 100644 --- a/dom/interfaces/events/nsIDOMEvent.idl +++ b/dom/interfaces/events/nsIDOMEvent.idl @@ -7,7 +7,7 @@ interface nsIDOMEventTarget; -[ptr] native WidgetEventPtr(mozilla::WidgetEvent); +[ptr] native WidgetEvent(mozilla::WidgetEvent); [ptr] native DOMEventPtr(mozilla::dom::Event); [ptr] native IPCMessagePtr(IPC::Message); [ptr] native ConstIPCMessagePtr(const IPC::Message); @@ -207,7 +207,7 @@ interface nsIDOMEvent : nsISupports [noscript] void duplicatePrivateData(); [noscript] void setTarget(in nsIDOMEventTarget aTarget); [notxpcom] boolean IsDispatchStopped(); - [notxpcom] WidgetEventPtr GetInternalNSEvent(); + [notxpcom] WidgetEvent WidgetEventPtr(); [noscript,notxpcom] void SetTrusted(in boolean aTrusted); [notxpcom] void Serialize(in IPCMessagePtr aMsg, in boolean aSerializeInterfaceType); diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 3b0928980d47d..363f0cba2f08e 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -3101,7 +3101,7 @@ TabParent::LayerTreeUpdate(bool aActive) event->InitEvent(NS_LITERAL_STRING("MozLayerTreeCleared"), true, false); } event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; bool dummy; mFrameElement->DispatchEvent(event, &dummy); return true; @@ -3136,7 +3136,7 @@ TabParent::RecvRemotePaintIsReady() RefPtr event = NS_NewDOMEvent(mFrameElement, nullptr, nullptr); event->InitEvent(NS_LITERAL_STRING("MozAfterRemotePaint"), false, false); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; bool dummy; mFrameElement->DispatchEvent(event, &dummy); return true; diff --git a/dom/media/gmp/GMPService.cpp b/dom/media/gmp/GMPService.cpp index 2360c434ce28a..00f158244c10b 100644 --- a/dom/media/gmp/GMPService.cpp +++ b/dom/media/gmp/GMPService.cpp @@ -205,7 +205,7 @@ GeckoMediaPluginService::GMPCrashCallback::Run(const nsACString& aPluginName) RefPtr event = dom::PluginCrashedEvent::Constructor(document, NS_LITERAL_STRING("PluginCrashed"), init); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; EventDispatcher::DispatchDOMEvent(parentWindow, nullptr, event, nullptr, nullptr); } diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index 28518c560f1ca..5e16be130077b 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -1665,7 +1665,7 @@ nsresult nsPluginInstanceOwner::DispatchFocusToPlugin(nsIDOMEvent* aFocusEvent) } #endif - WidgetEvent* theEvent = aFocusEvent->GetInternalNSEvent(); + WidgetEvent* theEvent = aFocusEvent->WidgetEventPtr(); if (theEvent) { WidgetGUIEvent focusEvent(theEvent->mFlags.mIsTrusted, theEvent->mMessage, nullptr); @@ -1707,7 +1707,7 @@ nsresult nsPluginInstanceOwner::DispatchKeyToPlugin(nsIDOMEvent* aKeyEvent) if (mInstance) { WidgetKeyboardEvent* keyEvent = - aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->WidgetEventPtr()->AsKeyboardEvent(); if (keyEvent && keyEvent->mClass == eKeyboardEventClass) { nsEventStatus rv = ProcessEvent(*keyEvent); if (nsEventStatus_eConsumeNoDefault == rv) { @@ -1742,7 +1742,7 @@ nsPluginInstanceOwner::ProcessMouseDown(nsIDOMEvent* aMouseEvent) } WidgetMouseEvent* mouseEvent = - aMouseEvent->GetInternalNSEvent()->AsMouseEvent(); + aMouseEvent->WidgetEventPtr()->AsMouseEvent(); if (mouseEvent && mouseEvent->mClass == eMouseEventClass) { mLastMouseDownButtonType = mouseEvent->button; nsEventStatus rv = ProcessEvent(*mouseEvent); @@ -1767,7 +1767,7 @@ nsresult nsPluginInstanceOwner::DispatchMouseToPlugin(nsIDOMEvent* aMouseEvent, return NS_OK; WidgetMouseEvent* mouseEvent = - aMouseEvent->GetInternalNSEvent()->AsMouseEvent(); + aMouseEvent->WidgetEventPtr()->AsMouseEvent(); if (mouseEvent && mouseEvent->mClass == eMouseEventClass) { nsEventStatus rv = ProcessEvent(*mouseEvent); if (nsEventStatus_eConsumeNoDefault == rv) { @@ -1882,7 +1882,7 @@ nsPluginInstanceOwner::DispatchCompositionToPlugin(nsIDOMEvent* aEvent) return NS_OK; } WidgetCompositionEvent* compositionEvent = - aEvent->GetInternalNSEvent()->AsCompositionEvent(); + aEvent->WidgetEventPtr()->AsCompositionEvent(); if (NS_WARN_IF(!compositionEvent)) { return NS_ERROR_INVALID_ARG; } @@ -2025,7 +2025,7 @@ nsPluginInstanceOwner::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr dragEvent(do_QueryInterface(aEvent)); if (dragEvent && mInstance) { - WidgetEvent* ievent = aEvent->GetInternalNSEvent(); + WidgetEvent* ievent = aEvent->WidgetEventPtr(); if (ievent && ievent->mFlags.mIsTrusted && ievent->mMessage != eDragEnter && ievent->mMessage != eDragOver) { aEvent->PreventDefault(); diff --git a/dom/workers/ServiceWorkerPrivate.cpp b/dom/workers/ServiceWorkerPrivate.cpp index c5e501ba959ce..455bf094f2999 100644 --- a/dom/workers/ServiceWorkerPrivate.cpp +++ b/dom/workers/ServiceWorkerPrivate.cpp @@ -264,7 +264,7 @@ class ExtendableEventWorkerRunnable : public WorkerRunnable MOZ_ASSERT(aWorkerScope); MOZ_ASSERT(aEvent); nsCOMPtr sgo = aWorkerScope; - WidgetEvent* internalEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = aEvent->WidgetEventPtr(); ErrorResult result; result = aWorkerScope->DispatchDOMEvent(nullptr, aEvent, nullptr, nullptr); @@ -1223,7 +1223,7 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable nsCOMPtr runnable; if (event->DefaultPrevented(aCx)) { event->ReportCanceled(); - } else if (event->GetInternalNSEvent()->mFlags.mExceptionHasBeenRisen) { + } else if (event->WidgetEventPtr()->mFlags.mExceptionHasBeenRisen) { // Exception logged via the WorkerPrivate ErrorReporter } else { runnable = new ResumeRequest(mInterceptedChannel); diff --git a/dom/xbl/nsXBLEventHandler.cpp b/dom/xbl/nsXBLEventHandler.cpp index 2522419f8e641..064d672e4ba12 100644 --- a/dom/xbl/nsXBLEventHandler.cpp +++ b/dom/xbl/nsXBLEventHandler.cpp @@ -90,7 +90,7 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers( uint32_t aCharCode, const IgnoreModifierState& aIgnoreModifierState) { - WidgetEvent* event = aKeyEvent->AsEvent()->GetInternalNSEvent(); + WidgetEvent* event = aKeyEvent->AsEvent()->WidgetEventPtr(); nsCOMPtr target = aKeyEvent->AsEvent()->InternalDOMEvent()->GetCurrentTarget(); bool executed = false; diff --git a/dom/xbl/nsXBLPrototypeHandler.cpp b/dom/xbl/nsXBLPrototypeHandler.cpp index c59f83bd595d0..b6ccff43e7e3c 100644 --- a/dom/xbl/nsXBLPrototypeHandler.cpp +++ b/dom/xbl/nsXBLPrototypeHandler.cpp @@ -905,7 +905,7 @@ nsXBLPrototypeHandler::ModifiersMatchMask( nsIDOMUIEvent* aEvent, const IgnoreModifierState& aIgnoreModifierState) { - WidgetInputEvent* inputEvent = aEvent->AsEvent()->GetInternalNSEvent()->AsInputEvent(); + WidgetInputEvent* inputEvent = aEvent->AsEvent()->WidgetEventPtr()->AsInputEvent(); NS_ENSURE_TRUE(inputEvent, false); if (mKeyMask & cMetaMask) { diff --git a/dom/xbl/nsXBLWindowKeyHandler.cpp b/dom/xbl/nsXBLWindowKeyHandler.cpp index 083a11aa6e40a..e34ab05749868 100644 --- a/dom/xbl/nsXBLWindowKeyHandler.cpp +++ b/dom/xbl/nsXBLWindowKeyHandler.cpp @@ -322,14 +322,14 @@ void nsXBLWindowKeyHandler::HandleEventOnCapture(nsIDOMKeyEvent* aEvent) { WidgetKeyboardEvent* widgetEvent = - aEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (widgetEvent->mFlags.mNoCrossProcessBoundaryForwarding) { return; } nsCOMPtr originalTarget = - do_QueryInterface(aEvent->AsEvent()->GetInternalNSEvent()->originalTarget); + do_QueryInterface(aEvent->AsEvent()->WidgetEventPtr()->originalTarget); if (!EventStateManager::IsRemoteTarget(originalTarget)) { return; } @@ -565,7 +565,7 @@ nsXBLWindowKeyHandler::WalkHandlersAndExecute( // retry to look for a shortcut key without the Windows-Logo key press. if (!aIgnoreModifierState.mOS) { WidgetKeyboardEvent* keyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (keyEvent && keyEvent->IsOS()) { IgnoreModifierState ignoreModifierState(aIgnoreModifierState); ignoreModifierState.mOS = true; diff --git a/editor/libeditor/nsEditor.cpp b/editor/libeditor/nsEditor.cpp index 43a3748fe8f94..160f7009d4c61 100644 --- a/editor/libeditor/nsEditor.cpp +++ b/editor/libeditor/nsEditor.cpp @@ -4616,7 +4616,7 @@ nsEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent) // HandleKeyPressEvent()'s switch statement. WidgetKeyboardEvent* nativeKeyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); NS_ENSURE_TRUE(nativeKeyEvent, NS_ERROR_UNEXPECTED); NS_ASSERTION(nativeKeyEvent->mMessage == eKeyPress, "HandleKeyPressEvent gets non-keypress event"); @@ -5053,7 +5053,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent) // If the event is trusted, the event should always cause input. NS_ENSURE_TRUE(aEvent, false); - WidgetEvent* widgetEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* widgetEvent = aEvent->WidgetEventPtr(); if (NS_WARN_IF(!widgetEvent)) { return false; } @@ -5086,7 +5086,7 @@ nsEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent) case eCompositionCommitAsIs: // Don't allow composition events whose internal event are not // WidgetCompositionEvent. - widgetGUIEvent = aEvent->GetInternalNSEvent()->AsCompositionEvent(); + widgetGUIEvent = aEvent->WidgetEventPtr()->AsCompositionEvent(); needsWidget = true; break; default: diff --git a/editor/libeditor/nsEditorEventListener.cpp b/editor/libeditor/nsEditorEventListener.cpp index 19c08ced023aa..a70c2e83467ae 100644 --- a/editor/libeditor/nsEditorEventListener.cpp +++ b/editor/libeditor/nsEditorEventListener.cpp @@ -357,7 +357,7 @@ nsEditorEventListener::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr kungFuDeathGrip = mEditor; - WidgetEvent* internalEvent = aEvent->GetInternalNSEvent(); + WidgetEvent* internalEvent = aEvent->WidgetEventPtr(); // Let's handle each event with the message of the internal event of the // coming event. If the DOM event was created with improper interface, @@ -641,7 +641,7 @@ nsEditorEventListener::KeyPress(nsIDOMKeyEvent* aKeyEvent) // Now, ask the native key bindings to handle the event. WidgetKeyboardEvent* keyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); MOZ_ASSERT(keyEvent, "DOM key event's internal event must be WidgetKeyboardEvent"); nsIWidget* widget = keyEvent->widget; @@ -1047,7 +1047,7 @@ nsEditorEventListener::HandleStartComposition(nsIDOMEvent* aCompositionEvent) return NS_OK; } WidgetCompositionEvent* compositionStart = - aCompositionEvent->GetInternalNSEvent()->AsCompositionEvent(); + aCompositionEvent->WidgetEventPtr()->AsCompositionEvent(); return mEditor->BeginIMEComposition(compositionStart); } diff --git a/editor/libeditor/nsHTMLEditor.cpp b/editor/libeditor/nsHTMLEditor.cpp index ca5684a5aada1..c8c4ddfd24054 100644 --- a/editor/libeditor/nsHTMLEditor.cpp +++ b/editor/libeditor/nsHTMLEditor.cpp @@ -617,7 +617,7 @@ nsHTMLEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent) } WidgetKeyboardEvent* nativeKeyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); NS_ENSURE_TRUE(nativeKeyEvent, NS_ERROR_UNEXPECTED); NS_ASSERTION(nativeKeyEvent->mMessage == eKeyPress, "HandleKeyPressEvent gets non-keypress event"); @@ -5182,7 +5182,7 @@ nsHTMLEditor::IsAcceptableInputEvent(nsIDOMEvent* aEvent) // While there is composition, all composition events in its top level window // are always fired on the composing editor. Therefore, if this editor has // composition, the composition events should be handled in this editor. - if (mComposition && aEvent->GetInternalNSEvent()->AsCompositionEvent()) { + if (mComposition && aEvent->WidgetEventPtr()->AsCompositionEvent()) { return true; } diff --git a/editor/libeditor/nsPlaintextDataTransfer.cpp b/editor/libeditor/nsPlaintextDataTransfer.cpp index 562cd7275ebd4..90daaed1d9095 100644 --- a/editor/libeditor/nsPlaintextDataTransfer.cpp +++ b/editor/libeditor/nsPlaintextDataTransfer.cpp @@ -184,7 +184,7 @@ nsresult nsPlaintextEditor::InsertFromDrop(nsIDOMEvent* aDropEvent) } if (nsContentUtils::CheckForSubFrameDrop(dragSession, - aDropEvent->GetInternalNSEvent()->AsDragEvent())) { + aDropEvent->WidgetEventPtr()->AsDragEvent())) { // Don't allow drags from subframe documents with different origins than // the drop destination. if (srcdomdoc && !IsSafeToInsertData(srcdomdoc)) diff --git a/editor/libeditor/nsPlaintextEditor.cpp b/editor/libeditor/nsPlaintextEditor.cpp index 17889286d1358..2ce2b624566f7 100644 --- a/editor/libeditor/nsPlaintextEditor.cpp +++ b/editor/libeditor/nsPlaintextEditor.cpp @@ -362,7 +362,7 @@ nsPlaintextEditor::HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent) } WidgetKeyboardEvent* nativeKeyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); NS_ENSURE_TRUE(nativeKeyEvent, NS_ERROR_UNEXPECTED); NS_ASSERTION(nativeKeyEvent->mMessage == eKeyPress, "HandleKeyPressEvent gets non-keypress event"); @@ -848,7 +848,7 @@ nsPlaintextEditor::UpdateIMEComposition(nsIDOMEvent* aDOMTextEvent) MOZ_ASSERT(aDOMTextEvent, "aDOMTextEvent must not be nullptr"); WidgetCompositionEvent* compositionChangeEvent = - aDOMTextEvent->GetInternalNSEvent()->AsCompositionEvent(); + aDOMTextEvent->WidgetEventPtr()->AsCompositionEvent(); NS_ENSURE_TRUE(compositionChangeEvent, NS_ERROR_INVALID_ARG); MOZ_ASSERT(compositionChangeEvent->mMessage == eCompositionChange, "The internal event should be eCompositionChange"); diff --git a/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp b/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp index 95272621162e1..427cea55e110a 100644 --- a/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp +++ b/embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp @@ -63,7 +63,7 @@ nsAutoWindowStateHelper::DispatchEventToChrome(const char* aEventName) } event->InitEvent(NS_ConvertASCIItoUTF16(aEventName), true, true); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; nsCOMPtr target = do_QueryInterface(mWindow); bool defaultActionEnabled; diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp index 564aaea49c1fe..23c66368a60cf 100644 --- a/layout/base/AccessibleCaretManager.cpp +++ b/layout/base/AccessibleCaretManager.cpp @@ -1209,7 +1209,7 @@ AccessibleCaretManager::DispatchCaretStateChangedEvent(CaretChangedReason aReaso CaretStateChangedEvent::Constructor(doc, NS_LITERAL_STRING("mozcaretstatechanged"), init); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; AC_LOG("%s: reason %d, collapsed %d, caretVisible %d", __FUNCTION__, init.mReason, init.mCollapsed, init.mCaretVisible); diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index e1d75dc5bd404..65a102e8be84b 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -1141,7 +1141,7 @@ nsDocumentViewer::PermitUnloadInternal(bool *aShouldPrompt, // the event being dispatched. if (!sIsBeforeUnloadDisabled && *aShouldPrompt && dialogsAreEnabled && mDocument && (!sBeforeUnloadRequiresInteraction || mDocument->UserHasInteracted()) && - (event->GetInternalNSEvent()->mFlags.mDefaultPrevented || + (event->WidgetEventPtr()->mFlags.mDefaultPrevented || !text.IsEmpty())) { // Ask the user if it's ok to unload the current page diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 6150054bb701b..2043b053a9815 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -2054,7 +2054,7 @@ nsLayoutUtils::GetDOMEventCoordinatesRelativeTo(nsIDOMEvent* aDOMEvent, nsIFrame { if (!aDOMEvent) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); - WidgetEvent* event = aDOMEvent->GetInternalNSEvent(); + WidgetEvent* event = aDOMEvent->WidgetEventPtr(); if (!event) return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE); return GetEventCoordinatesRelativeTo(event, aFrame); diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index a18f1889326fa..570bf9e032f4b 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -1643,7 +1643,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent) // So we cheat here by either setting or unsetting the clcikCount in the native event // so the right thing happens for the onclick event WidgetMouseEvent* mouseEvent = - aMouseEvent->GetInternalNSEvent()->AsMouseEvent(); + aMouseEvent->WidgetEventPtr()->AsMouseEvent(); int32_t selectedIndex; if (NS_SUCCEEDED(GetIndexFromDOMEvent(aMouseEvent, selectedIndex))) { @@ -2097,7 +2097,7 @@ nsListControlFrame::KeyDown(nsIDOMEvent* aKeyEvent) // XXXmats in onkeydown. That seems sub-optimal though. const WidgetKeyboardEvent* keyEvent = - aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->WidgetEventPtr()->AsKeyboardEvent(); MOZ_ASSERT(keyEvent, "DOM event must have WidgetKeyboardEvent for its internal event"); @@ -2250,7 +2250,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent) AutoIncrementalSearchResetter incrementalSearchResetter; const WidgetKeyboardEvent* keyEvent = - aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->WidgetEventPtr()->AsKeyboardEvent(); MOZ_ASSERT(keyEvent, "DOM event must have WidgetKeyboardEvent for its internal event"); diff --git a/layout/printing/nsPrintPreviewListener.cpp b/layout/printing/nsPrintPreviewListener.cpp index bbc7fe60da183..f30b1bfc566ce 100644 --- a/layout/printing/nsPrintPreviewListener.cpp +++ b/layout/printing/nsPrintPreviewListener.cpp @@ -112,7 +112,7 @@ static eEventAction GetActionForEvent(nsIDOMEvent* aEvent) { WidgetKeyboardEvent* keyEvent = - aEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aEvent->WidgetEventPtr()->AsKeyboardEvent(); if (!keyEvent) { return eEventAction_Suppress; } diff --git a/layout/xul/nsMenuBarFrame.cpp b/layout/xul/nsMenuBarFrame.cpp index a232de4e0a22a..451786280ab05 100644 --- a/layout/xul/nsMenuBarFrame.cpp +++ b/layout/xul/nsMenuBarFrame.cpp @@ -166,7 +166,7 @@ nsMenuBarFrame::FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent) AutoTArray accessKeys; WidgetKeyboardEvent* nativeKeyEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsKeyboardEvent(); if (nativeKeyEvent) nsContentUtils::GetAccessKeyCandidates(nativeKeyEvent, accessKeys); if (accessKeys.IsEmpty() && charCode) diff --git a/layout/xul/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp index 20c9518066a04..512479ca6769a 100644 --- a/layout/xul/nsMenuBarListener.cpp +++ b/layout/xul/nsMenuBarListener.cpp @@ -219,7 +219,7 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent) bool hasAccessKeyCandidates = charCode != 0; if (!hasAccessKeyCandidates) { WidgetKeyboardEvent* nativeKeyEvent = - aKeyEvent->GetInternalNSEvent()->AsKeyboardEvent(); + aKeyEvent->WidgetEventPtr()->AsKeyboardEvent(); if (nativeKeyEvent) { AutoTArray keys; nsContentUtils::GetAccessKeyCandidates(nativeKeyEvent, keys); @@ -294,7 +294,7 @@ Modifiers nsMenuBarListener::GetModifiersForAccessKey(nsIDOMKeyEvent* aKeyEvent) { WidgetInputEvent* inputEvent = - aKeyEvent->AsEvent()->GetInternalNSEvent()->AsInputEvent(); + aKeyEvent->AsEvent()->WidgetEventPtr()->AsInputEvent(); MOZ_ASSERT(inputEvent); static const Modifiers kPossibleModifiersForAccessKey = diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index 717599292c390..e13c2693d01c5 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -966,7 +966,7 @@ nsSliderFrame::StartDrag(nsIDOMEvent* aEvent) nsGkAtoms::_true, eCaseMatters)) return NS_OK; - WidgetGUIEvent* event = aEvent->GetInternalNSEvent()->AsGUIEvent(); + WidgetGUIEvent* event = aEvent->WidgetEventPtr()->AsGUIEvent(); if (!ShouldScrollForEvent(event)) { return NS_OK; diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp index 92463eda63aff..8f598cf68708c 100644 --- a/layout/xul/nsXULPopupManager.cpp +++ b/layout/xul/nsXULPopupManager.cpp @@ -597,7 +597,7 @@ nsXULPopupManager::InitTriggerEvent(nsIDOMEvent* aEvent, nsIContent* aPopup, // get the event coordinates relative to the root frame of the document // containing the popup. NS_ASSERTION(aPopup, "Expected a popup node"); - WidgetEvent* event = aEvent->GetInternalNSEvent(); + WidgetEvent* event = aEvent->WidgetEventPtr(); if (event) { WidgetInputEvent* inputEvent = event->AsInputEvent(); if (inputEvent) { @@ -2058,7 +2058,7 @@ nsXULPopupManager::HandleShortcutNavigation(nsIDOMKeyEvent* aKeyEvent, { // On Windows, don't check shortcuts when the accelerator key is down. #ifdef XP_WIN - WidgetInputEvent* evt = aKeyEvent->AsEvent()->GetInternalNSEvent()->AsInputEvent(); + WidgetInputEvent* evt = aKeyEvent->AsEvent()->WidgetEventPtr()->AsInputEvent(); if (evt && evt->IsAccel()) { return false; } @@ -2074,7 +2074,7 @@ nsXULPopupManager::HandleShortcutNavigation(nsIDOMKeyEvent* aKeyEvent, if (result) { aFrame->ChangeMenuItem(result, false, true); if (action) { - WidgetGUIEvent* evt = aKeyEvent->AsEvent()->GetInternalNSEvent()->AsGUIEvent(); + WidgetGUIEvent* evt = aKeyEvent->AsEvent()->WidgetEventPtr()->AsGUIEvent(); nsMenuFrame* menuToOpen = result->Enter(evt); if (menuToOpen) { nsCOMPtr content = menuToOpen->GetContent(); @@ -2321,7 +2321,7 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( // Enter method will return a menu if one needs to be opened as a result. nsMenuFrame* menuToOpen = nullptr; WidgetGUIEvent* GUIEvent = aKeyEvent->AsEvent()-> - GetInternalNSEvent()->AsGUIEvent(); + WidgetEventPtr()->AsGUIEvent(); if (aTopVisibleMenuItem) { menuToOpen = aTopVisibleMenuItem->Frame()->Enter(GUIEvent); diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index 1dfcc0a5fcdb4..533a65a703995 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -2628,7 +2628,7 @@ PeerConnectionImpl::PluginCrash(uint32_t aPluginID, PluginCrashedEvent::Constructor(doc, NS_LITERAL_STRING("PluginCrashed"), init); event->SetTrusted(true); - event->GetInternalNSEvent()->mFlags.mOnlyChromeDispatch = true; + event->WidgetEventPtr()->mFlags.mOnlyChromeDispatch = true; EventDispatcher::DispatchDOMEvent(mWindow, nullptr, event, nullptr, nullptr); #endif