diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 0c8f14fbaa..ac3c7784bc 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -1946,10 +1946,10 @@ nsDOMWindowUtils::SendQueryContentEvent(uint32_t aType, message = NS_QUERY_TEXT_RECT; break; case QUERY_EDITOR_RECT: - message = NS_QUERY_EDITOR_RECT; + message = eQueryEditorRect; break; case QUERY_CHARACTER_AT_POINT: - message = NS_QUERY_CHARACTER_AT_POINT; + message = eQueryCharacterAtPoint; break; default: return NS_ERROR_INVALID_ARG; @@ -1961,9 +1961,9 @@ nsDOMWindowUtils::SendQueryContentEvent(uint32_t aType, bool useNativeLineBreak = !(aAdditionalFlags & QUERY_CONTENT_FLAG_USE_XP_LINE_BREAK); - if (message == NS_QUERY_CHARACTER_AT_POINT) { + if (message == eQueryCharacterAtPoint) { // Looking for the widget at the point. - WidgetQueryContentEvent dummyEvent(true, NS_QUERY_CONTENT_STATE, widget); + WidgetQueryContentEvent dummyEvent(true, eQueryContentState, widget); dummyEvent.mUseNativeLineBreak = useNativeLineBreak; InitEvent(dummyEvent, &pt); nsIFrame* popupFrame = @@ -2062,25 +2062,26 @@ nsDOMWindowUtils::SendContentCommandEvent(const nsAString& aType, return NS_ERROR_FAILURE; EventMessage msg; - if (aType.EqualsLiteral("cut")) - msg = NS_CONTENT_COMMAND_CUT; - else if (aType.EqualsLiteral("copy")) - msg = NS_CONTENT_COMMAND_COPY; - else if (aType.EqualsLiteral("paste")) - msg = NS_CONTENT_COMMAND_PASTE; - else if (aType.EqualsLiteral("delete")) - msg = NS_CONTENT_COMMAND_DELETE; - else if (aType.EqualsLiteral("undo")) - msg = NS_CONTENT_COMMAND_UNDO; - else if (aType.EqualsLiteral("redo")) - msg = NS_CONTENT_COMMAND_REDO; - else if (aType.EqualsLiteral("pasteTransferable")) - msg = NS_CONTENT_COMMAND_PASTE_TRANSFERABLE; - else + if (aType.EqualsLiteral("cut")) { + msg = eContentCommandCut; + } else if (aType.EqualsLiteral("copy")) { + msg = eContentCommandCopy; + } else if (aType.EqualsLiteral("paste")) { + msg = eContentCommandPaste; + } else if (aType.EqualsLiteral("delete")) { + msg = eContentCommandDelete; + } else if (aType.EqualsLiteral("undo")) { + msg = eContentCommandUndo; + } else if (aType.EqualsLiteral("redo")) { + msg = eContentCommandRedo; + } else if (aType.EqualsLiteral("pasteTransferable")) { + msg = eContentCommandPasteTransferable; + } else { return NS_ERROR_FAILURE; + } WidgetContentCommandEvent event(true, msg, widget); - if (msg == NS_CONTENT_COMMAND_PASTE_TRANSFERABLE) { + if (msg == eContentCommandPasteTransferable) { event.mTransferable = aTransferable; } diff --git a/dom/base/nsQueryContentEventResult.cpp b/dom/base/nsQueryContentEventResult.cpp index f293ec8911..6f3a830652 100644 --- a/dom/base/nsQueryContentEventResult.cpp +++ b/dom/base/nsQueryContentEventResult.cpp @@ -59,8 +59,8 @@ static bool IsRectEnabled(EventMessage aEventMessage) { return aEventMessage == eQueryCaretRect || aEventMessage == NS_QUERY_TEXT_RECT || - aEventMessage == NS_QUERY_EDITOR_RECT || - aEventMessage == NS_QUERY_CHARACTER_AT_POINT; + aEventMessage == eQueryEditorRect || + aEventMessage == eQueryCharacterAtPoint; } NS_IMETHODIMP @@ -136,7 +136,7 @@ nsQueryContentEventResult::GetNotFound(bool *aNotFound) { NS_ENSURE_TRUE(mSucceeded, NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(mEventMessage == eQuerySelectedText || - mEventMessage == NS_QUERY_CHARACTER_AT_POINT, + mEventMessage == eQueryCharacterAtPoint, NS_ERROR_NOT_AVAILABLE); *aNotFound = (mOffset == WidgetQueryContentEvent::NOT_FOUND); return NS_OK; @@ -148,7 +148,7 @@ nsQueryContentEventResult::GetTentativeCaretOffsetNotFound(bool* aNotFound) if (NS_WARN_IF(!mSucceeded)) { return NS_ERROR_NOT_AVAILABLE; } - if (NS_WARN_IF(mEventMessage != NS_QUERY_CHARACTER_AT_POINT)) { + if (NS_WARN_IF(mEventMessage != eQueryCharacterAtPoint)) { return NS_ERROR_NOT_AVAILABLE; } *aNotFound = (mTentativeCaretOffset == WidgetQueryContentEvent::NOT_FOUND); diff --git a/dom/events/ContentEventHandler.cpp b/dom/events/ContentEventHandler.cpp index 37e2ae35a0..73dd49e2dc 100644 --- a/dom/events/ContentEventHandler.cpp +++ b/dom/events/ContentEventHandler.cpp @@ -804,15 +804,15 @@ ContentEventHandler::HandleQueryContentEvent(WidgetQueryContentEvent* aEvent) return OnQueryCaretRect(aEvent); case NS_QUERY_TEXT_RECT: return OnQueryTextRect(aEvent); - case NS_QUERY_EDITOR_RECT: + case eQueryEditorRect: return OnQueryEditorRect(aEvent); - case NS_QUERY_CONTENT_STATE: + case eQueryContentState: return OnQueryContentState(aEvent); case eQuerySelectionAsTransferable: return OnQuerySelectionAsTransferable(aEvent); - case NS_QUERY_CHARACTER_AT_POINT: + case eQueryCharacterAtPoint: return OnQueryCharacterAtPoint(aEvent); - case NS_QUERY_DOM_WIDGET_HITTEST: + case eQueryDOMWidgetHittest: return OnQueryDOMWidgetHittest(aEvent); default: return NS_ERROR_NOT_IMPLEMENTED; @@ -1267,7 +1267,7 @@ ContentEventHandler::OnQueryCharacterAtPoint(WidgetQueryContentEvent* aEvent) NS_ENSURE_TRUE(rootWidget, NS_ERROR_FAILURE); } - WidgetQueryContentEvent eventOnRoot(true, NS_QUERY_CHARACTER_AT_POINT, + WidgetQueryContentEvent eventOnRoot(true, eQueryCharacterAtPoint, rootWidget); eventOnRoot.mUseNativeLineBreak = aEvent->mUseNativeLineBreak; eventOnRoot.refPoint = aEvent->refPoint; diff --git a/dom/events/ContentEventHandler.h b/dom/events/ContentEventHandler.h index 2d16a089d0..a2b1043a63 100644 --- a/dom/events/ContentEventHandler.h +++ b/dom/events/ContentEventHandler.h @@ -50,15 +50,15 @@ public: nsresult OnQueryCaretRect(WidgetQueryContentEvent* aEvent); // NS_QUERY_TEXT_RECT event handler nsresult OnQueryTextRect(WidgetQueryContentEvent* aEvent); - // NS_QUERY_EDITOR_RECT event handler + // eQueryEditorRect event handler nsresult OnQueryEditorRect(WidgetQueryContentEvent* aEvent); - // NS_QUERY_CONTENT_STATE event handler + // eQueryContentState event handler nsresult OnQueryContentState(WidgetQueryContentEvent* aEvent); // eQuerySelectionAsTransferable event handler nsresult OnQuerySelectionAsTransferable(WidgetQueryContentEvent* aEvent); - // NS_QUERY_CHARACTER_AT_POINT event handler + // eQueryCharacterAtPoint event handler nsresult OnQueryCharacterAtPoint(WidgetQueryContentEvent* aEvent); - // NS_QUERY_DOM_WIDGET_HITTEST event handler + // eQueryDOMWidgetHittest event handler nsresult OnQueryDOMWidgetHittest(WidgetQueryContentEvent* aEvent); // NS_SELECTION_* event diff --git a/dom/events/EventListenerManager.cpp b/dom/events/EventListenerManager.cpp index 3368b28883..2cf5a5a89b 100644 --- a/dom/events/EventListenerManager.cpp +++ b/dom/events/EventListenerManager.cpp @@ -292,7 +292,7 @@ EventListenerManager::AddEventListenerInternal( mMayHaveCapturingListeners = true; } - if (aEventMessage == NS_AFTERPAINT) { + if (aEventMessage == eAfterPaint) { mMayHavePaintEventListener = true; nsPIDOMWindow* window = GetInnerWindowForTarget(); if (window) { diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index de455abb21..0233e6c1e5 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -295,11 +295,11 @@ EVENT(mouseup, EventNameType_All, eMouseEventClass) EVENT(mozfullscreenchange, - NS_FULLSCREENCHANGE, + eFullscreenChange, EventNameType_HTML, eBasicEventClass) EVENT(mozfullscreenerror, - NS_FULLSCREENERROR, + eFullscreenError, EventNameType_HTML, eBasicEventClass) EVENT(mozpointerlockchange, @@ -418,7 +418,7 @@ EVENT(toggle, EventNameType_HTML, eBasicEventClass) EVENT(volumechange, - NS_VOLUMECHANGE, + eVolumeChange, EventNameType_HTML, eBasicEventClass) EVENT(waiting, @@ -443,11 +443,11 @@ EVENT(paste, eClipboardEventClass) // Gecko-specific extensions that apply to elements EVENT(beforescriptexecute, - NS_BEFORE_SCRIPT_EXECUTE, + eBeforeScriptExecute, EventNameType_HTMLXUL, eBasicEventClass) EVENT(afterscriptexecute, - NS_AFTER_SCRIPT_EXECUTE, + eAfterScriptExecute, EventNameType_HTMLXUL, eBasicEventClass) @@ -658,7 +658,7 @@ NON_IDL_EVENT(MozMousePixelScroll, eMouseScrollEventClass) NON_IDL_EVENT(open, - NS_OPEN, + eOpen, EventNameType_None, eBasicEventClass) @@ -822,7 +822,7 @@ NON_IDL_EVENT(repeatEvent, eSMILTimeEventClass) NON_IDL_EVENT(MozAfterPaint, - NS_AFTERPAINT, + eAfterPaint, EventNameType_None, eBasicEventClass) @@ -921,15 +921,15 @@ NON_IDL_EVENT(transitionend, EventNameType_None, eTransitionEventClass) NON_IDL_EVENT(animationstart, - NS_ANIMATION_START, + eAnimationStart, EventNameType_None, eAnimationEventClass) NON_IDL_EVENT(animationend, - NS_ANIMATION_END, + eAnimationEnd, EventNameType_None, eAnimationEventClass) NON_IDL_EVENT(animationiteration, - NS_ANIMATION_ITERATION, + eAnimationIteration, EventNameType_None, eAnimationEventClass) diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 7c7b12ee89..be8f20b308 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -763,21 +763,17 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext, IMEStateManager::HandleSelectionEvent(aPresContext, GetFocusedContent(), aEvent->AsSelectionEvent()); break; - case NS_CONTENT_COMMAND_CUT: - case NS_CONTENT_COMMAND_COPY: - case NS_CONTENT_COMMAND_PASTE: - case NS_CONTENT_COMMAND_DELETE: - case NS_CONTENT_COMMAND_UNDO: - case NS_CONTENT_COMMAND_REDO: - case NS_CONTENT_COMMAND_PASTE_TRANSFERABLE: - { - DoContentCommandEvent(aEvent->AsContentCommandEvent()); - } + case eContentCommandCut: + case eContentCommandCopy: + case eContentCommandPaste: + case eContentCommandDelete: + case eContentCommandUndo: + case eContentCommandRedo: + case eContentCommandPasteTransferable: + DoContentCommandEvent(aEvent->AsContentCommandEvent()); break; - case NS_CONTENT_COMMAND_SCROLL: - { - DoContentCommandScrollEvent(aEvent->AsContentCommandEvent()); - } + case eContentCommandScroll: + DoContentCommandScrollEvent(aEvent->AsContentCommandEvent()); break; case NS_COMPOSITION_START: if (aEvent->mFlags.mIsTrusted) { @@ -805,7 +801,7 @@ EventStateManager::HandleQueryContentEvent(WidgetQueryContentEvent* aEvent) case eQueryTextContent: case eQueryCaretRect: case NS_QUERY_TEXT_RECT: - case NS_QUERY_EDITOR_RECT: + case eQueryEditorRect: if (!IsTargetCrossProcess(aEvent)) { break; } @@ -813,10 +809,10 @@ EventStateManager::HandleQueryContentEvent(WidgetQueryContentEvent* aEvent) GetCrossProcessTarget()->HandleQueryContentEvent(*aEvent); return; // Following events have not been supported in e10s mode yet. - case NS_QUERY_CONTENT_STATE: + case eQueryContentState: case eQuerySelectionAsTransferable: - case NS_QUERY_CHARACTER_AT_POINT: - case NS_QUERY_DOM_WIDGET_HITTEST: + case eQueryCharacterAtPoint: + case eQueryDOMWidgetHittest: break; default: return; @@ -5063,25 +5059,25 @@ EventStateManager::DoContentCommandEvent(WidgetContentCommandEvent* aEvent) NS_ENSURE_TRUE(root, NS_ERROR_FAILURE); const char* cmd; switch (aEvent->mMessage) { - case NS_CONTENT_COMMAND_CUT: + case eContentCommandCut: cmd = "cmd_cut"; break; - case NS_CONTENT_COMMAND_COPY: + case eContentCommandCopy: cmd = "cmd_copy"; break; - case NS_CONTENT_COMMAND_PASTE: + case eContentCommandPaste: cmd = "cmd_paste"; break; - case NS_CONTENT_COMMAND_DELETE: + case eContentCommandDelete: cmd = "cmd_delete"; break; - case NS_CONTENT_COMMAND_UNDO: + case eContentCommandUndo: cmd = "cmd_undo"; break; - case NS_CONTENT_COMMAND_REDO: + case eContentCommandRedo: cmd = "cmd_redo"; break; - case NS_CONTENT_COMMAND_PASTE_TRANSFERABLE: + case eContentCommandPasteTransferable: cmd = "cmd_pasteTransferable"; break; default: @@ -5101,7 +5097,7 @@ EventStateManager::DoContentCommandEvent(WidgetContentCommandEvent* aEvent) aEvent->mIsEnabled = canDoIt; if (canDoIt && !aEvent->mOnlyEnabledCheck) { switch (aEvent->mMessage) { - case NS_CONTENT_COMMAND_PASTE_TRANSFERABLE: { + case eContentCommandPasteTransferable: { nsCOMPtr commandController = do_QueryInterface(controller); NS_ENSURE_STATE(commandController); diff --git a/dom/events/IMEContentObserver.cpp b/dom/events/IMEContentObserver.cpp index 20ecd6f524..019d5d6c6e 100644 --- a/dom/events/IMEContentObserver.cpp +++ b/dom/events/IMEContentObserver.cpp @@ -59,18 +59,18 @@ ToChar(EventMessage aEventMessage) return "eQueryCaretRect"; case NS_QUERY_TEXT_RECT: return "NS_QUERY_TEXT_RECT"; - case NS_QUERY_EDITOR_RECT: - return "NS_QUERY_EDITOR_RECT"; - case NS_QUERY_CONTENT_STATE: - return "NS_QUERY_CONTENT_STATE"; + case eQueryEditorRect: + return "eQueryEditorRect"; + case eQueryContentState: + return "eQueryContentState"; case eQuerySelectionAsTransferable: return "eQuerySelectionAsTransferable"; - case NS_QUERY_CHARACTER_AT_POINT: - return "NS_QUERY_CHARACTER_AT_POINT"; - case NS_QUERY_DOM_WIDGET_HITTEST: - return "NS_QUERY_DOM_WIDGET_HITTEST"; + case eQueryCharacterAtPoint: + return "eQueryCharacterAtPoint"; + case eQueryDOMWidgetHittest: + return "eQueryDOMWidgetHittest"; default: - return "Unsupprted message"; + return "Unsupported message"; } } @@ -620,7 +620,7 @@ IMEContentObserver::OnMouseButtonEvent(nsPresContext* aPresContext, nsRefPtr kungFuDeathGrip(this); - WidgetQueryContentEvent charAtPt(true, NS_QUERY_CHARACTER_AT_POINT, + WidgetQueryContentEvent charAtPt(true, eQueryCharacterAtPoint, aMouseEvent->widget); charAtPt.refPoint = aMouseEvent->refPoint; ContentEventHandler handler(aPresContext); diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 0ed12e5745..432cca970c 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -2335,7 +2335,7 @@ TabParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent) switch (aEvent.mMessage) { case NS_QUERY_TEXT_RECT: case eQueryCaretRect: - case NS_QUERY_EDITOR_RECT: + case eQueryEditorRect: aEvent.mReply.mRect -= GetChildProcessOffset(); break; default: diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 456bdfcdeb..97c2b1d86b 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -2222,8 +2222,7 @@ nsPresContext::FireDOMPaintEvent(nsInvalidateRequestList* aList) // (hopefully it won't, or we're likely to get an infinite loop! At least // it won't be blocking app execution though). nsRefPtr event = - NS_NewDOMNotifyPaintEvent(eventTarget, this, nullptr, NS_AFTERPAINT, - aList); + NS_NewDOMNotifyPaintEvent(eventTarget, this, nullptr, eAfterPaint, aList); // Even if we're not telling the window about the event (so eventTarget is // the chrome event handler, not the window), the window is still diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index b99d22acf3..50ff0a30fb 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -235,11 +235,11 @@ CSSAnimation::QueueEvents() EventMessage message; if (!wasActive && isActive) { - message = NS_ANIMATION_START; + message = eAnimationStart; } else if (wasActive && !isActive) { - message = NS_ANIMATION_END; + message = eAnimationEnd; } else if (wasActive && isActive && !isSameIteration) { - message = NS_ANIMATION_ITERATION; + message = eAnimationIteration; } else if (skippedActivePhase) { // First notifying for start of 0th iteration by appending an // 'animationstart': @@ -247,24 +247,23 @@ CSSAnimation::QueueEvents() std::min(StickyTimeDuration(mEffect->InitialAdvance()), computedTiming.mActiveDuration); manager->QueueEvent( - AnimationEventInfo(owningElement, mAnimationName, NS_ANIMATION_START, + AnimationEventInfo(owningElement, mAnimationName, eAnimationStart, elapsedTime, owningPseudoType)); // Then have the shared code below append an 'animationend': - message = NS_ANIMATION_END; + message = eAnimationEnd; } else { return; // No events need to be sent } StickyTimeDuration elapsedTime; - if (message == NS_ANIMATION_START || - message == NS_ANIMATION_ITERATION) { + if (message == eAnimationStart || message == eAnimationIteration) { TimeDuration iterationStart = mEffect->Timing().mIterationDuration * computedTiming.mCurrentIteration; elapsedTime = StickyTimeDuration(std::max(iterationStart, mEffect->InitialAdvance())); } else { - MOZ_ASSERT(message == NS_ANIMATION_END); + MOZ_ASSERT(message == eAnimationEnd); elapsedTime = computedTiming.mActiveDuration; } diff --git a/widget/ContentCache.cpp b/widget/ContentCache.cpp index 3ea10e8b7b..efe4844293 100644 --- a/widget/ContentCache.cpp +++ b/widget/ContentCache.cpp @@ -251,7 +251,7 @@ ContentCacheInChild::CacheEditorRect(nsIWidget* aWidget, this, aWidget, GetNotificationName(aNotification))); nsEventStatus status = nsEventStatus_eIgnore; - WidgetQueryContentEvent editorRectEvent(true, NS_QUERY_EDITOR_RECT, aWidget); + WidgetQueryContentEvent editorRectEvent(true, eQueryEditorRect, aWidget); aWidget->DispatchEvent(&editorRectEvent, status); if (NS_WARN_IF(!editorRectEvent.mSucceeded)) { MOZ_LOG(sContentCacheLog, LogLevel::Error, @@ -665,10 +665,10 @@ ContentCacheInParent::HandleQueryContentEvent(WidgetQueryContentEvent& aEvent, "Succeeded, aEvent={ mReply={ mOffset=%u, mRect=%s } }", this, aEvent.mReply.mOffset, GetRectText(aEvent.mReply.mRect).get())); break; - case NS_QUERY_EDITOR_RECT: + case eQueryEditorRect: MOZ_LOG(sContentCacheLog, LogLevel::Info, ("ContentCacheInParent: 0x%p HandleQueryContentEvent(" - "aEvent={ mMessage=NS_QUERY_EDITOR_RECT }, aWidget=0x%p)", + "aEvent={ mMessage=eQueryEditorRect }, aWidget=0x%p)", this, aWidget)); aEvent.mReply.mRect = mEditorRect; MOZ_LOG(sContentCacheLog, LogLevel::Info, diff --git a/widget/ContentCache.h b/widget/ContentCache.h index 79367ac718..29070708c1 100644 --- a/widget/ContentCache.h +++ b/widget/ContentCache.h @@ -298,7 +298,7 @@ public: * * For eQueryCaretRect, fail if cached offset isn't equals to input * - * For NS_QUERY_EDITOR_RECT, always success + * For eQueryEditorRect, always success */ bool HandleQueryContentEvent(WidgetQueryContentEvent& aEvent, nsIWidget* aWidget) const; diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 4900298a90..e28fc76b0e 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -229,19 +229,19 @@ NS_EVENT_MESSAGE(eQueryCaretRect, eQueryContentEventFirst + 3) NS_EVENT_MESSAGE(NS_QUERY_TEXT_RECT, eQueryContentEventFirst + 4) // Query for the bounding rect of the current focused frame. Result is relative // to top level widget coordinates -NS_EVENT_MESSAGE(NS_QUERY_EDITOR_RECT, eQueryContentEventFirst + 5) +NS_EVENT_MESSAGE(eQueryEditorRect, eQueryContentEventFirst + 5) // Query for the current state of the content. The particular members of // mReply that are set for each query content event will be valid on success. -NS_EVENT_MESSAGE(NS_QUERY_CONTENT_STATE, eQueryContentEventFirst + 6) +NS_EVENT_MESSAGE(eQueryContentState, eQueryContentEventFirst + 6) // Query for the selection in the form of a nsITransferable. NS_EVENT_MESSAGE(eQuerySelectionAsTransferable, eQueryContentEventFirst + 7) // Query for character at a point. This returns the character offset, its // rect and also tentative caret point if the point is clicked. The point is // specified by Event::refPoint. -NS_EVENT_MESSAGE(NS_QUERY_CHARACTER_AT_POINT, eQueryContentEventFirst + 8) +NS_EVENT_MESSAGE(eQueryCharacterAtPoint, eQueryContentEventFirst + 8) // Query if the DOM element under Event::refPoint belongs to our widget // or not. -NS_EVENT_MESSAGE(NS_QUERY_DOM_WIDGET_HITTEST, eQueryContentEventFirst + 9) +NS_EVENT_MESSAGE(eQueryDOMWidgetHittest, eQueryContentEventFirst + 9) // Video events NS_EVENT_MESSAGE(eMediaEventFirst, 3300) @@ -264,11 +264,11 @@ NS_EVENT_MESSAGE(eTimeUpdate, eMediaEventFirst + 15) NS_EVENT_MESSAGE(eEnded, eMediaEventFirst + 16) NS_EVENT_MESSAGE(eRateChange, eMediaEventFirst + 17) NS_EVENT_MESSAGE(eDurationChange, eMediaEventFirst + 18) -NS_EVENT_MESSAGE(NS_VOLUMECHANGE, eMediaEventFirst + 19) +NS_EVENT_MESSAGE(eVolumeChange, eMediaEventFirst + 19) // paint notification events -NS_EVENT_MESSAGE(NS_NOTIFYPAINT_START, 3400) -NS_EVENT_MESSAGE(NS_AFTERPAINT, NS_NOTIFYPAINT_START) +NS_EVENT_MESSAGE(ePaintEventFirst, 3400) +NS_EVENT_MESSAGE(eAfterPaint, ePaintEventFirst) // Simple gesture events NS_EVENT_MESSAGE(NS_SIMPLE_GESTURE_EVENT_START, 3500) @@ -298,21 +298,21 @@ NS_EVENT_MESSAGE(eSelectionEventFirst, 3700) NS_EVENT_MESSAGE(eSetSelection, eSelectionEventFirst) // Events of commands for the contents -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_EVENT_START, 3800) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_CUT, NS_CONTENT_COMMAND_EVENT_START) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_COPY, NS_CONTENT_COMMAND_EVENT_START + 1) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_PASTE, NS_CONTENT_COMMAND_EVENT_START + 2) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_DELETE, NS_CONTENT_COMMAND_EVENT_START + 3) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_UNDO, NS_CONTENT_COMMAND_EVENT_START + 4) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_REDO, NS_CONTENT_COMMAND_EVENT_START + 5) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_PASTE_TRANSFERABLE, NS_CONTENT_COMMAND_EVENT_START + 6) -// NS_CONTENT_COMMAND_SCROLL scrolls the nearest scrollable element to the +NS_EVENT_MESSAGE(eContentCommandEventFirst, 3800) +NS_EVENT_MESSAGE(eContentCommandCut, eContentCommandEventFirst) +NS_EVENT_MESSAGE(eContentCommandCopy, eContentCommandEventFirst + 1) +NS_EVENT_MESSAGE(eContentCommandPaste, eContentCommandEventFirst + 2) +NS_EVENT_MESSAGE(eContentCommandDelete, eContentCommandEventFirst + 3) +NS_EVENT_MESSAGE(eContentCommandUndo, eContentCommandEventFirst + 4) +NS_EVENT_MESSAGE(eContentCommandRedo, eContentCommandEventFirst + 5) +NS_EVENT_MESSAGE(eContentCommandPasteTransferable, eContentCommandEventFirst + 6) +// eContentCommandScroll scrolls the nearest scrollable element to the // currently focused content or latest DOM selection. This would normally be // the same element scrolled by keyboard scroll commands, except that this event // will scroll an element scrollable in either direction. I.e., if the nearest // scrollable ancestor element can only be scrolled vertically, and horizontal // scrolling is requested using this event, no scrolling will occur. -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_SCROLL, NS_CONTENT_COMMAND_EVENT_START+7) +NS_EVENT_MESSAGE(eContentCommandScroll, eContentCommandEventFirst + 7) // Event to gesture notification NS_EVENT_MESSAGE(NS_GESTURENOTIFY_EVENT_START, 3900) @@ -325,10 +325,10 @@ NS_EVENT_MESSAGE(NS_SCROLLEDAREACHANGED, NS_SCROLLAREA_EVENT_START) NS_EVENT_MESSAGE(NS_TRANSITION_EVENT_START, 4200) NS_EVENT_MESSAGE(NS_TRANSITION_END, NS_TRANSITION_EVENT_START) -NS_EVENT_MESSAGE(eAnimationEventFirst, 4250) -NS_EVENT_MESSAGE(NS_ANIMATION_START, eAnimationEventFirst) -NS_EVENT_MESSAGE(NS_ANIMATION_END, eAnimationEventFirst + 1) -NS_EVENT_MESSAGE(NS_ANIMATION_ITERATION, eAnimationEventFirst + 2) +NS_EVENT_MESSAGE(eAnimationEventFirst, 4250) +NS_EVENT_MESSAGE(eAnimationStart, eAnimationEventFirst) +NS_EVENT_MESSAGE(eAnimationEnd, eAnimationEventFirst + 1) +NS_EVENT_MESSAGE(eAnimationIteration, eAnimationEventFirst + 2) NS_EVENT_MESSAGE(NS_SMIL_TIME_EVENT_START, 4300) NS_EVENT_MESSAGE(NS_SMIL_BEGIN, NS_SMIL_TIME_EVENT_START) @@ -340,9 +340,9 @@ NS_EVENT_MESSAGE(NS_AUDIO_PROCESS, NS_WEBAUDIO_EVENT_START) NS_EVENT_MESSAGE(NS_AUDIO_COMPLETE, NS_WEBAUDIO_EVENT_START + 1) // script notification events -NS_EVENT_MESSAGE(NS_NOTIFYSCRIPT_START, 4500) -NS_EVENT_MESSAGE(NS_BEFORE_SCRIPT_EXECUTE, NS_NOTIFYSCRIPT_START) -NS_EVENT_MESSAGE(NS_AFTER_SCRIPT_EXECUTE, NS_NOTIFYSCRIPT_START + 1) +NS_EVENT_MESSAGE(eScriptEventFirst, 4500) +NS_EVENT_MESSAGE(eBeforeScriptExecute, eScriptEventFirst) +NS_EVENT_MESSAGE(eAfterScriptExecute, eScriptEventFirst + 1) NS_EVENT_MESSAGE(NS_PRINT_EVENT_START, 4600) NS_EVENT_MESSAGE(NS_BEFOREPRINT, NS_PRINT_EVENT_START) @@ -352,9 +352,8 @@ NS_EVENT_MESSAGE(NS_MESSAGE_EVENT_START, 4700) NS_EVENT_MESSAGE(NS_MESSAGE, NS_MESSAGE_EVENT_START) // Open and close events -NS_EVENT_MESSAGE(NS_OPENCLOSE_EVENT_START, 4800) -NS_EVENT_MESSAGE(NS_OPEN, NS_OPENCLOSE_EVENT_START) -NS_EVENT_MESSAGE(NS_CLOSE, NS_OPENCLOSE_EVENT_START+1) +NS_EVENT_MESSAGE(eOpenCloseEventFirst, 4800) +NS_EVENT_MESSAGE(eOpen, eOpenCloseEventFirst) // Device motion and orientation NS_EVENT_MESSAGE(NS_DEVICE_ORIENTATION_START, 4900) @@ -367,9 +366,9 @@ NS_EVENT_MESSAGE(NS_DEVICE_LIGHT, NS_DEVICE_ORIENTATION_START + 4) NS_EVENT_MESSAGE(NS_SHOW_EVENT, 5000) // Fullscreen DOM API -NS_EVENT_MESSAGE(NS_FULL_SCREEN_START, 5100) -NS_EVENT_MESSAGE(NS_FULLSCREENCHANGE, NS_FULL_SCREEN_START) -NS_EVENT_MESSAGE(NS_FULLSCREENERROR, NS_FULL_SCREEN_START + 1) +NS_EVENT_MESSAGE(eFullscreenEventFirst, 5100) +NS_EVENT_MESSAGE(eFullscreenChange, eFullscreenEventFirst) +NS_EVENT_MESSAGE(eFullscreenError, eFullscreenEventFirst + 1) NS_EVENT_MESSAGE(NS_TOUCH_EVENT_START, 5200) NS_EVENT_MESSAGE(NS_TOUCH_START, NS_TOUCH_EVENT_START) @@ -382,10 +381,10 @@ NS_EVENT_MESSAGE(NS_POINTERLOCK_START, 5300) NS_EVENT_MESSAGE(NS_POINTERLOCKCHANGE, NS_POINTERLOCK_START) NS_EVENT_MESSAGE(NS_POINTERLOCKERROR, NS_POINTERLOCK_START + 1) -NS_EVENT_MESSAGE(NS_WHEEL_EVENT_START, 5400) -NS_EVENT_MESSAGE(NS_WHEEL_WHEEL, NS_WHEEL_EVENT_START) -NS_EVENT_MESSAGE(NS_WHEEL_START, NS_WHEEL_EVENT_START + 1) -NS_EVENT_MESSAGE(NS_WHEEL_STOP, NS_WHEEL_EVENT_START + 2) +NS_EVENT_MESSAGE(eWheelEventFirst, 5400) +NS_EVENT_MESSAGE(NS_WHEEL_WHEEL, eWheelEventFirst) +NS_EVENT_MESSAGE(NS_WHEEL_START, eWheelEventFirst + 1) +NS_EVENT_MESSAGE(NS_WHEEL_STOP, eWheelEventFirst + 2) //System time is changed NS_EVENT_MESSAGE(NS_MOZ_TIME_CHANGE_EVENT, 5500) diff --git a/widget/MiscEvents.h b/widget/MiscEvents.h index 7f206f818f..4349dd786b 100644 --- a/widget/MiscEvents.h +++ b/widget/MiscEvents.h @@ -46,10 +46,10 @@ public: return nullptr; } - // NS_CONTENT_COMMAND_PASTE_TRANSFERABLE + // eContentCommandPasteTransferable nsCOMPtr mTransferable; // [in] - // NS_CONTENT_COMMAND_SCROLL + // eContentCommandScroll // for mScroll.mUnit enum { diff --git a/widget/TextEvents.h b/widget/TextEvents.h index 75c5588616..2f251a0f84 100644 --- a/widget/TextEvents.h +++ b/widget/TextEvents.h @@ -523,7 +523,7 @@ public: void InitForQueryDOMWidgetHittest(const mozilla::LayoutDeviceIntPoint& aPoint) { - NS_ASSERTION(mMessage == NS_QUERY_DOM_WIDGET_HITTEST, + NS_ASSERTION(mMessage == eQueryDOMWidgetHittest, "wrong initializer is called"); refPoint = aPoint; } @@ -577,7 +577,7 @@ public: { void* mContentsRoot; uint32_t mOffset; - // mTentativeCaretOffset is used by only NS_QUERY_CHARACTER_AT_POINT. + // mTentativeCaretOffset is used by only eQueryCharacterAtPoint. // This is the offset where caret would be if user clicked at the refPoint. uint32_t mTentativeCaretOffset; nsString mString; diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm index 34e76608f5..cfa454109c 100644 --- a/widget/cocoa/TextInputHandler.mm +++ b/widget/cocoa/TextInputHandler.mm @@ -2099,8 +2099,7 @@ TextInputHandler::InsertText(NSAttributedString* aAttrString, } // Delete the selected range. nsRefPtr kungFuDeathGrip(this); - WidgetContentCommandEvent deleteCommandEvent(true, - NS_CONTENT_COMMAND_DELETE, + WidgetContentCommandEvent deleteCommandEvent(true, eContentCommandDelete, mWidget); DispatchEvent(deleteCommandEvent); NS_ENSURE_TRUE_VOID(deleteCommandEvent.mSucceeded); @@ -3258,7 +3257,7 @@ IMEInputHandler::CharacterIndexForPoint(NSPoint& aPoint) return NSNotFound; } - WidgetQueryContentEvent charAt(true, NS_QUERY_CHARACTER_AT_POINT, mWidget); + WidgetQueryContentEvent charAt(true, eQueryCharacterAtPoint, mWidget); NSPoint ptInWindow = [mainWindow convertScreenToBase:aPoint]; NSPoint ptInView = [mView convertPoint:ptInWindow fromView:nil]; charAt.refPoint.x = diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 747cd01d34..490347bf99 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -6031,8 +6031,7 @@ PanGestureTypeForEvent(NSEvent* aEvent) // Determine if there is a selection (if sending to the service). if (sendType) { - WidgetQueryContentEvent event(true, NS_QUERY_CONTENT_STATE, - mGeckoChild); + WidgetQueryContentEvent event(true, eQueryContentState, mGeckoChild); // This might destroy our widget (and null out mGeckoChild). mGeckoChild->DispatchWindowEvent(event); if (!mGeckoChild || !event.mSucceeded || !event.mReply.mHasSelection) @@ -6042,7 +6041,7 @@ PanGestureTypeForEvent(NSEvent* aEvent) // Determine if we can paste (if receiving data from the service). if (mGeckoChild && returnType) { WidgetContentCommandEvent command(true, - NS_CONTENT_COMMAND_PASTE_TRANSFERABLE, + eContentCommandPasteTransferable, mGeckoChild, true); // This might possibly destroy our widget (and null out mGeckoChild). mGeckoChild->DispatchWindowEvent(command); @@ -6140,7 +6139,7 @@ PanGestureTypeForEvent(NSEvent* aEvent) NS_ENSURE_TRUE(mGeckoChild, false); WidgetContentCommandEvent command(true, - NS_CONTENT_COMMAND_PASTE_TRANSFERABLE, + eContentCommandPasteTransferable, mGeckoChild); command.mTransferable = trans; mGeckoChild->DispatchWindowEvent(command); diff --git a/widget/gtk/IMContextWrapper.cpp b/widget/gtk/IMContextWrapper.cpp index e4945538c6..23f6606f0c 100644 --- a/widget/gtk/IMContextWrapper.cpp +++ b/widget/gtk/IMContextWrapper.cpp @@ -2080,8 +2080,7 @@ IMContextWrapper::DeleteText(GtkIMContext* aContext, } // Delete the selection - WidgetContentCommandEvent contentCommandEvent(true, - NS_CONTENT_COMMAND_DELETE, + WidgetContentCommandEvent contentCommandEvent(true, eContentCommandDelete, mLastFocusedWindow); mLastFocusedWindow->DispatchEvent(&contentCommandEvent, status); diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index ad9d3f912b..f78cf83fac 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -2936,18 +2936,18 @@ nsWindow::OnKeyPressEvent(GdkEventKey *aEvent) return DispatchCommandEvent(nsGkAtoms::Home); case XF86XK_Copy: case GDK_F16: // F16, F20, F18, F14 are old keysyms for Copy Cut Paste Undo - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_COPY); + return DispatchContentCommandEvent(eContentCommandCopy); case XF86XK_Cut: case GDK_F20: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_CUT); + return DispatchContentCommandEvent(eContentCommandCut); case XF86XK_Paste: case GDK_F18: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_PASTE); + return DispatchContentCommandEvent(eContentCommandPaste); case GDK_Redo: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_REDO); + return DispatchContentCommandEvent(eContentCommandRedo); case GDK_Undo: case GDK_F14: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_UNDO); + return DispatchContentCommandEvent(eContentCommandUndo); } #endif /* ! AIX */ #endif /* MOZ_X11 */ @@ -3027,7 +3027,8 @@ nsWindow::OnScrollEvent(GdkEventScroll *aEvent) return; #if GTK_CHECK_VERSION(3,4,0) // check for duplicate legacy scroll event, see GNOME bug 726878 - if (mLastScrollEventTime == aEvent->time) + if (aEvent->direction != GDK_SCROLL_SMOOTH && + mLastScrollEventTime == aEvent->time) return; #endif WidgetWheelEvent wheelEvent(true, NS_WHEEL_WHEEL, this); diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp index ef2794b9dc..57e8241d3e 100644 --- a/widget/nsBaseWidget.cpp +++ b/widget/nsBaseWidget.cpp @@ -2627,8 +2627,8 @@ case _value: eventName.AssignLiteral(_name) ; break _ASSIGN_eventName(eMouseMove,"eMouseMove"); _ASSIGN_eventName(eLoad,"eLoad"); _ASSIGN_eventName(ePopState,"ePopState"); - _ASSIGN_eventName(NS_BEFORE_SCRIPT_EXECUTE,"NS_BEFORE_SCRIPT_EXECUTE"); - _ASSIGN_eventName(NS_AFTER_SCRIPT_EXECUTE,"NS_AFTER_SCRIPT_EXECUTE"); + _ASSIGN_eventName(eBeforeScriptExecute,"eBeforeScriptExecute"); + _ASSIGN_eventName(eAfterScriptExecute,"eAfterScriptExecute"); _ASSIGN_eventName(eUnload,"eUnload"); _ASSIGN_eventName(eHashChange,"eHashChange"); _ASSIGN_eventName(eReadyStateChange,"eReadyStateChange"); diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp index 538aa8dde8..7a0aa32655 100644 --- a/widget/qt/nsWindow.cpp +++ b/widget/qt/nsWindow.cpp @@ -1202,24 +1202,24 @@ nsWindow::keyPressEvent(QKeyEvent* aEvent) return DispatchCommandEvent(nsGkAtoms::Home); case Qt::Key_Copy: case Qt::Key_F16: // F16, F20, F18, F14 are old keysyms for Copy Cut Paste Undo - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_COPY); + return DispatchContentCommandEvent(eContentCommandCopy); case Qt::Key_Cut: case Qt::Key_F20: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_CUT); + return DispatchContentCommandEvent(eContentCommandCut); case Qt::Key_Paste: case Qt::Key_F18: case Qt::Key_F9: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_PASTE); + return DispatchContentCommandEvent(eContentCommandPaste); case Qt::Key_F14: - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_UNDO); + return DispatchContentCommandEvent(eContentCommandUndo); } // Qt::Key_Redo and Qt::Key_Undo are not available yet. if (aEvent->nativeVirtualKey() == 0xff66) { - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_REDO); + return DispatchContentCommandEvent(eContentCommandRedo); } if (aEvent->nativeVirtualKey() == 0xff65) { - return DispatchContentCommandEvent(NS_CONTENT_COMMAND_UNDO); + return DispatchContentCommandEvent(eContentCommandUndo); } WidgetKeyboardEvent event(true, eKeyPress, this); @@ -1665,7 +1665,7 @@ nsWindow::DispatchCommandEvent(nsIAtom* aCommand) } nsEventStatus -nsWindow::DispatchContentCommandEvent(int32_t aMsg) +nsWindow::DispatchContentCommandEvent(EventMessage aMsg) { WidgetContentCommandEvent event(true, aMsg, this); diff --git a/widget/qt/nsWindow.h b/widget/qt/nsWindow.h index f580a2962a..c539959267 100644 --- a/widget/qt/nsWindow.h +++ b/widget/qt/nsWindow.h @@ -259,7 +259,7 @@ private: void SetDefaultIcon(void); nsEventStatus DispatchCommandEvent(nsIAtom* aCommand); - nsEventStatus DispatchContentCommandEvent(int32_t aMsg); + nsEventStatus DispatchContentCommandEvent(mozilla::EventMessage aMsg); void SetSoftwareKeyboardState(bool aOpen, const InputContextAction& aAction); void ClearCachedResources(); diff --git a/widget/windows/IMMHandler.cpp b/widget/windows/IMMHandler.cpp index 043c1855fa..b823e2c0ec 100644 --- a/widget/windows/IMMHandler.cpp +++ b/widget/windows/IMMHandler.cpp @@ -1654,12 +1654,12 @@ IMMHandler::HandleQueryCharPosition(nsWindow* aWindow, pCharPosition->cLineHeight = r.height; - WidgetQueryContentEvent editorRect(true, NS_QUERY_EDITOR_RECT, aWindow); + WidgetQueryContentEvent editorRect(true, eQueryEditorRect, aWindow); aWindow->InitEvent(editorRect); aWindow->DispatchWindowEvent(&editorRect); if (NS_WARN_IF(!editorRect.mSucceeded)) { MOZ_LOG(gIMMLog, LogLevel::Error, - ("IMM: HandleQueryCharPosition, NS_QUERY_EDITOR_RECT failed")); + ("IMM: HandleQueryCharPosition, eQueryEditorRect failed")); ::GetWindowRect(aWindow->GetWindowHandle(), &pCharPosition->rcDocument); } else { nsIntRect editorRectInWindow = @@ -2376,13 +2376,13 @@ void IMMHandler::SetIMERelatedWindowsPosOnPlugin(nsWindow* aWindow, const IMEContext& aContext) { - WidgetQueryContentEvent editorRectEvent(true, NS_QUERY_EDITOR_RECT, aWindow); + WidgetQueryContentEvent editorRectEvent(true, eQueryEditorRect, aWindow); aWindow->InitEvent(editorRectEvent); aWindow->DispatchWindowEvent(&editorRectEvent); if (!editorRectEvent.mSucceeded) { MOZ_LOG(gIMMLog, LogLevel::Info, ("IMM: SetIMERelatedWindowsPosOnPlugin, " - "FAILED, due to NS_QUERY_EDITOR_RECT failure")); + "FAILED, due to eQueryEditorRect failure")); return; } diff --git a/widget/windows/KeyboardLayout.cpp b/widget/windows/KeyboardLayout.cpp index b4edd1176e..e2f344ef02 100644 --- a/widget/windows/KeyboardLayout.cpp +++ b/widget/windows/KeyboardLayout.cpp @@ -1350,19 +1350,19 @@ NativeKey::HandleAppCommandMessage() const // Use content command for following commands: case APPCOMMAND_COPY: - contentCommandMessage = NS_CONTENT_COMMAND_COPY; + contentCommandMessage = eContentCommandCopy; break; case APPCOMMAND_CUT: - contentCommandMessage = NS_CONTENT_COMMAND_CUT; + contentCommandMessage = eContentCommandCut; break; case APPCOMMAND_PASTE: - contentCommandMessage = NS_CONTENT_COMMAND_PASTE; + contentCommandMessage = eContentCommandPaste; break; case APPCOMMAND_REDO: - contentCommandMessage = NS_CONTENT_COMMAND_REDO; + contentCommandMessage = eContentCommandRedo; break; case APPCOMMAND_UNDO: - contentCommandMessage = NS_CONTENT_COMMAND_UNDO; + contentCommandMessage = eContentCommandUndo; break; } diff --git a/widget/windows/TSFTextStore.cpp b/widget/windows/TSFTextStore.cpp index 8383a83ba4..0b6e0bd2c9 100644 --- a/widget/windows/TSFTextStore.cpp +++ b/widget/windows/TSFTextStore.cpp @@ -3347,7 +3347,7 @@ TSFTextStore::GetACPFromPoint(TsViewCookie vcView, // NOTE: Don't check if the point is in the widget since the point can be // outside of the widget if focused editor is in a XUL . - WidgetQueryContentEvent charAtPt(true, NS_QUERY_CHARACTER_AT_POINT, mWidget); + WidgetQueryContentEvent charAtPt(true, eQueryCharacterAtPoint, mWidget); mWidget->InitEvent(charAtPt, &ourPt); // FYI: WidgetQueryContentEvent may cause flushing pending layout and it @@ -3357,7 +3357,7 @@ TSFTextStore::GetACPFromPoint(TsViewCookie vcView, if (!mWidget || mWidget->Destroyed()) { MOZ_LOG(sTextStoreLog, LogLevel::Error, ("TSF: 0x%p TSFTextStore::GetACPFromPoint() FAILED due to " - "mWidget was destroyed during NS_QUERY_CHARACTER_AT_POINT", this)); + "mWidget was destroyed during eQueryCharacterAtPoint", this)); return E_FAIL; } @@ -3370,7 +3370,7 @@ TSFTextStore::GetACPFromPoint(TsViewCookie vcView, if (NS_WARN_IF(!charAtPt.mSucceeded)) { MOZ_LOG(sTextStoreLog, LogLevel::Error, ("TSF: 0x%p TSFTextStore::GetACPFromPoint() FAILED due to " - "NS_QUERY_CHARACTER_AT_POINT failure", this)); + "eQueryCharacterAtPoint failure", this)); return E_FAIL; } @@ -3678,13 +3678,13 @@ TSFTextStore::GetScreenExtInternal(RECT& aScreenExt) ("TSF: 0x%p TSFTextStore::GetScreenExtInternal()", this)); // use NS_QUERY_EDITOR_RECT to get rect in system, screen coordinates - WidgetQueryContentEvent event(true, NS_QUERY_EDITOR_RECT, mWidget); + WidgetQueryContentEvent event(true, eQueryEditorRect, mWidget); mWidget->InitEvent(event); DispatchEvent(event); if (!event.mSucceeded) { MOZ_LOG(sTextStoreLog, LogLevel::Error, ("TSF: 0x%p TSFTextStore::GetScreenExtInternal() FAILED due to " - "NS_QUERY_EDITOR_RECT failure", this)); + "eQueryEditorRect failure", this)); return false; } diff --git a/widget/windows/WinMouseScrollHandler.cpp b/widget/windows/WinMouseScrollHandler.cpp index 6dfcde7d6e..070920db1a 100644 --- a/widget/windows/WinMouseScrollHandler.cpp +++ b/widget/windows/WinMouseScrollHandler.cpp @@ -541,9 +541,7 @@ MouseScrollHandler::ProcessNativeScrollMessage(nsWindowBase* aWidget, aWParam, aLParam)); // Scroll message generated by external application - WidgetContentCommandEvent commandEvent(true, NS_CONTENT_COMMAND_SCROLL, - aWidget); - + WidgetContentCommandEvent commandEvent(true, eContentCommandScroll, aWidget); commandEvent.mScroll.mIsHorizontal = (aMessage == WM_HSCROLL); switch (LOWORD(aWParam)) { diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 02cdc900d5..44584849db 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -5414,7 +5414,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case WM_CLEAR: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_DELETE, this); + WidgetContentCommandEvent command(true, eContentCommandDelete, this); DispatchWindowEvent(&command); result = true; } @@ -5422,7 +5422,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case WM_CUT: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_CUT, this); + WidgetContentCommandEvent command(true, eContentCommandCut, this); DispatchWindowEvent(&command); result = true; } @@ -5430,7 +5430,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case WM_COPY: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_COPY, this); + WidgetContentCommandEvent command(true, eContentCommandCopy, this); DispatchWindowEvent(&command); result = true; } @@ -5438,7 +5438,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case WM_PASTE: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_PASTE, this); + WidgetContentCommandEvent command(true, eContentCommandPaste, this); DispatchWindowEvent(&command); result = true; } @@ -5446,7 +5446,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case EM_UNDO: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_UNDO, this); + WidgetContentCommandEvent command(true, eContentCommandUndo, this); DispatchWindowEvent(&command); *aRetValue = (LRESULT)(command.mSucceeded && command.mIsEnabled); result = true; @@ -5455,7 +5455,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case EM_REDO: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_REDO, this); + WidgetContentCommandEvent command(true, eContentCommandRedo, this); DispatchWindowEvent(&command); *aRetValue = (LRESULT)(command.mSucceeded && command.mIsEnabled); result = true; @@ -5467,7 +5467,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, // Support EM_CANPASTE message only when wParam isn't specified or // is plain text format. if (wParam == 0 || wParam == CF_TEXT || wParam == CF_UNICODETEXT) { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_PASTE, + WidgetContentCommandEvent command(true, eContentCommandPaste, this, true); DispatchWindowEvent(&command); *aRetValue = (LRESULT)(command.mSucceeded && command.mIsEnabled); @@ -5478,8 +5478,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case EM_CANUNDO: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_UNDO, - this, true); + WidgetContentCommandEvent command(true, eContentCommandUndo, this, true); DispatchWindowEvent(&command); *aRetValue = (LRESULT)(command.mSucceeded && command.mIsEnabled); result = true; @@ -5488,8 +5487,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case EM_CANREDO: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_REDO, - this, true); + WidgetContentCommandEvent command(true, eContentCommandRedo, this, true); DispatchWindowEvent(&command); *aRetValue = (LRESULT)(command.mSucceeded && command.mIsEnabled); result = true;