wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 895274 part.51 Rename NS_CONTEXTMENU to eContextMenu r=smaug

Browse Source
This commit is contained in:
Masayuki Nakano 2015-09-01 00:20:06 +09:00
parent efd286938a
commit 021b22502c
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsContentUtils.cpp
View File

@ -7848,7 +7848,7 @@ nsContentUtils::SendMouseEvent(nsCOMPtr<nsIPresShell> aPresShell,
else if (aType.EqualsLiteral("mouseout"))
msg = eMouseExitFromWidget;
else if (aType.EqualsLiteral("contextmenu")) {
msg = NS_CONTEXTMENU;
msg = eContextMenu;
contextMenuKey = (aButton == 0);
} else if (aType.EqualsLiteral("MozMouseHittest"))
msg = eMouseHitTest;

2
dom/events/EventNameList.h
View File

@ -169,7 +169,7 @@ EVENT(click,
EventNameType_All,
eMouseEventClass)
EVENT(contextmenu,
NS_CONTEXTMENU,
eContextMenu,
EventNameType_HTMLXUL,
eMouseEventClass)
// Not supported yet

8
dom/events/EventStateManager.cpp
View File

@ -543,7 +543,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
*aStatus = nsEventStatus_eIgnore;
switch (aEvent->mMessage) {
case NS_CONTEXTMENU:
case eContextMenu:
if (sIsPointerLocked) {
return NS_ERROR_DOM_INVALID_STATE_ERR;
}
@ -1174,7 +1174,7 @@ CrossProcessSafeEvent(const WidgetEvent& aEvent)
case eMouseDown:
case eMouseUp:
case eMouseMove:
case NS_CONTEXTMENU:
case eContextMenu:
case eMouseEnterIntoWidget:
case eMouseExitFromWidget:
return true;
@ -1452,7 +1452,7 @@ EventStateManager::FireContextClick()
if (allowedToDispatch) {
// init the event while mCurrentTarget is still good
WidgetMouseEvent event(true, NS_CONTEXTMENU, targetWidget,
WidgetMouseEvent event(true, eContextMenu, targetWidget,
WidgetMouseEvent::eReal);
event.clickCount = 1;
FillInEventFromGestureDown(&event);
@ -1478,7 +1478,7 @@ EventStateManager::FireContextClick()
nullptr, &status);
// We don't need to dispatch to frame handling because no frames
// watch NS_CONTEXTMENU except for nsMenuFrame and that's only for
// watch eContextMenu except for nsMenuFrame and that's only for
// dismissal. That's just as well since we don't really know
// which frame to send it to.
}

2
dom/events/WheelHandlingHelper.cpp
View File

@ -214,7 +214,7 @@ WheelTransaction::OnEvent(WidgetEvent* aEvent)
case eMouseDown:
case eMouseDoubleClick:
case eMouseClick:
case NS_CONTEXTMENU:
case eContextMenu:
case NS_DRAGDROP_DROP:
EndTransaction();
return;

2
dom/xul/nsXULElement.cpp
View File

@ -1268,7 +1268,7 @@ nsXULElement::PreHandleEvent(EventChainPreVisitor& aVisitor)
(aVisitor.mEvent->mMessage == eMouseClick ||
aVisitor.mEvent->mMessage == eMouseDoubleClick ||
aVisitor.mEvent->mMessage == NS_XUL_COMMAND ||
aVisitor.mEvent->mMessage == NS_CONTEXTMENU ||
aVisitor.mEvent->mMessage == eContextMenu ||
aVisitor.mEvent->mMessage == NS_DRAGDROP_START ||
aVisitor.mEvent->mMessage == NS_DRAGDROP_GESTURE)) {
// Don't propagate these events from native anonymous scrollbar.

2
editor/libeditor/nsHTMLEditorEventListener.cpp
View File

@ -90,7 +90,7 @@ nsHTMLEditorEventListener::MouseDown(nsIDOMMouseEvent* aMouseEvent)
// Detect only "context menu" click
// XXX This should be easier to do!
// But eDOMEvents_contextmenu and NS_CONTEXTMENU is not exposed in any event
// But eDOMEvents_contextmenu and eContextMenu is not exposed in any event
// interface :-(
int16_t buttonNumber;
nsresult rv = aMouseEvent->GetButton(&buttonNumber);

2
gfx/layers/apz/src/APZCTreeManager.cpp
View File

@ -893,7 +893,7 @@ APZCTreeManager::UpdateWheelTransaction(WidgetInputEvent& aEvent)
case eMouseDown:
case eMouseDoubleClick:
case eMouseClick:
case NS_CONTEXTMENU:
case eContextMenu:
case NS_DRAGDROP_DROP:
txn->EndTransaction();
return;

2
layout/base/nsPresShell.cpp
View File

@ -7914,7 +7914,7 @@ PresShell::HandleEventInternal(WidgetEvent* aEvent, nsEventStatus* aStatus)
}
}
if (aEvent->mMessage == NS_CONTEXTMENU) {
if (aEvent->mMessage == eContextMenu) {
WidgetMouseEvent* mouseEvent = aEvent->AsMouseEvent();
if (mouseEvent->context == WidgetMouseEvent::eContextMenuKey &&
!AdjustContextMenuKeyEvent(mouseEvent)) {

2
layout/xul/nsMenuFrame.cpp
View File

@ -434,7 +434,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext,
(aEvent->mMessage == eMouseUp &&
aEvent->AsMouseEvent()->button == WidgetMouseEvent::eRightButton) &&
#else
aEvent->mMessage == NS_CONTEXTMENU &&
aEvent->mMessage == eContextMenu &&
#endif
onmenu && !IsMenu() && !IsDisabled()) {
// if this menu is a context menu it accepts right-clicks...fire away!

2
widget/EventMessageList.h
View File

@ -77,7 +77,7 @@ NS_EVENT_MESSAGE(ePointerLostCapture, ePointerEventFirst + 28)
NS_EVENT_MESSAGE(ePointerEventLast, ePointerLostCapture)
NS_EVENT_MESSAGE(eContextMenuFirst, 500)
NS_EVENT_MESSAGE(NS_CONTEXTMENU, eContextMenuFirst)
NS_EVENT_MESSAGE(eContextMenu, eContextMenuFirst)
NS_EVENT_MESSAGE(NS_STREAM_EVENT_START, 1100)
NS_EVENT_MESSAGE(NS_LOAD, NS_STREAM_EVENT_START)

8
widget/MouseEvents.h
View File

@ -229,7 +229,7 @@ public:
mFlags.mBubbles = false;
mFlags.mCancelable = false;
break;
case NS_CONTEXTMENU:
case eContextMenu:
button = (context == eNormal) ? eRightButton : eLeftButton;
break;
default:
@ -240,10 +240,10 @@ public:
#ifdef DEBUG
virtual ~WidgetMouseEvent()
{
NS_WARN_IF_FALSE(mMessage != NS_CONTEXTMENU ||
NS_WARN_IF_FALSE(mMessage != eContextMenu ||
button ==
((context == eNormal) ? eRightButton : eLeftButton),
"Wrong button set to NS_CONTEXTMENU event?");
"Wrong button set to eContextMenu event?");
}
#endif
@ -287,7 +287,7 @@ public:
*/
bool IsContextMenuKeyEvent() const
{
return mMessage == NS_CONTEXTMENU && context == eContextMenuKey;
return mMessage == eContextMenu && context == eContextMenuKey;
}
/**

2
widget/android/nsWindow.cpp
View File

@ -988,7 +988,7 @@ nsWindow::OnContextmenuEvent(AndroidGeckoEvent *ae)
}
// Send the contextmenu event.
WidgetMouseEvent contextMenuEvent(true, NS_CONTEXTMENU, this,
WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
WidgetMouseEvent::eReal, WidgetMouseEvent::eNormal);
contextMenuEvent.refPoint =
RoundedToInt(pt * GetDefaultScale()) - WidgetToScreenOffset();

2
widget/cocoa/nsChildView.mm
View File

@ -5091,7 +5091,7 @@ PanGestureTypeForEvent(NSEvent* aEvent)
return nil;
}
WidgetMouseEvent geckoEvent(true, NS_CONTEXTMENU, mGeckoChild,
WidgetMouseEvent geckoEvent(true, eContextMenu, mGeckoChild,
WidgetMouseEvent::eReal);
[self convertCocoaMouseEvent:theEvent toGeckoEvent:&geckoEvent];
geckoEvent.button = WidgetMouseEvent::eRightButton;

4
widget/gtk/nsWindow.cpp
View File

@ -2765,7 +2765,7 @@ nsWindow::OnButtonPressEvent(GdkEventButton *aEvent)
// right menu click on linux should also pop up a context menu
if (domButton == WidgetMouseEvent::eRightButton &&
MOZ_LIKELY(!mIsDestroyed)) {
WidgetMouseEvent contextMenuEvent(true, NS_CONTEXTMENU, this,
WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
WidgetMouseEvent::eReal);
InitButtonEvent(contextMenuEvent, aEvent);
contextMenuEvent.pressure = mLastMotionPressure;
@ -3059,7 +3059,7 @@ nsWindow::OnKeyPressEvent(GdkEventKey *aEvent)
// before we dispatch a key, check if it's the context menu key.
// If so, send a context menu key event instead.
if (is_context_menu_key(event)) {
WidgetMouseEvent contextMenuEvent(true, NS_CONTEXTMENU, this,
WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
WidgetMouseEvent::eReal,
WidgetMouseEvent::eContextMenuKey);

4
widget/qt/nsWindow.cpp
View File

@ -1006,7 +1006,7 @@ nsWindow::mousePressEvent(QMouseEvent* aEvent)
// Right click on linux should also pop up a context menu.
if (event.button == WidgetMouseEvent::eRightButton &&
MOZ_LIKELY(!mIsDestroyed)) {
WidgetMouseEvent contextMenuEvent(true, NS_CONTEXTMENU, this,
WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
WidgetMouseEvent::eReal);
InitMouseEvent(contextMenuEvent, aEvent, 1);
DispatchEvent(&contextMenuEvent, status);
@ -1140,7 +1140,7 @@ nsWindow::keyPressEvent(QKeyEvent* aEvent)
// Before we dispatch a key, check if it's the context menu key.
// If so, send a context menu key event instead.
if (IsContextMenuKeyEvent(aEvent)) {
WidgetMouseEvent contextMenuEvent(true, NS_CONTEXTMENU, this,
WidgetMouseEvent contextMenuEvent(true, eContextMenu, this,
WidgetMouseEvent::eReal,
WidgetMouseEvent::eContextMenuKey);
return DispatchEvent(&contextMenuEvent);

4
widget/windows/nsWindow.cpp
View File

@ -4052,7 +4052,7 @@ nsWindow::DispatchMouseEvent(EventMessage aEventMessage, WPARAM wParam,
WidgetMouseEvent event(true, aEventMessage, this, WidgetMouseEvent::eReal,
aIsContextMenuKey ? WidgetMouseEvent::eContextMenuKey :
WidgetMouseEvent::eNormal);
if (aEventMessage == NS_CONTEXTMENU && aIsContextMenuKey) {
if (aEventMessage == eContextMenu && aIsContextMenuKey) {
nsIntPoint zero(0, 0);
InitEvent(event, &zero);
} else {
@ -5206,7 +5206,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam,
pos = lParamToClient(lParam);
}
result = DispatchMouseEvent(NS_CONTEXTMENU, wParam, pos, contextMenukey,
result = DispatchMouseEvent(eContextMenu, wParam, pos, contextMenukey,
contextMenukey ?
WidgetMouseEvent::eLeftButton :
WidgetMouseEvent::eRightButton,