Bug 812427 part.3 Remove NS_POPUP_EVENT r=roc+smaug

This commit is contained in:
Masayuki Nakano 2012-11-20 15:05:56 +09:00
parent bc39d12867
commit 61c782cf5e
5 changed files with 0 additions and 17 deletions

View File

@ -704,15 +704,6 @@ nsDOMEvent::DuplicatePrivateData()
newEvent = newFocusEvent;
break;
}
case NS_POPUP_EVENT:
{
newEvent = new nsInputEvent(false, msg, nullptr);
NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
isInputEvent = true;
newEvent->eventStructType = NS_POPUP_EVENT;
break;
}
case NS_COMMAND_EVENT:
{
newEvent = new nsCommandEvent(false, mEvent->userType,
@ -1062,7 +1053,6 @@ nsDOMEvent::GetScreenCoords(nsPresContext* aPresContext,
if (!aEvent ||
(aEvent->eventStructType != NS_MOUSE_EVENT &&
aEvent->eventStructType != NS_POPUP_EVENT &&
aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
aEvent->eventStructType != NS_WHEEL_EVENT &&
aEvent->eventStructType != NS_TOUCH_EVENT &&
@ -1121,7 +1111,6 @@ nsDOMEvent::GetClientCoords(nsPresContext* aPresContext,
if (!aEvent ||
(aEvent->eventStructType != NS_MOUSE_EVENT &&
aEvent->eventStructType != NS_POPUP_EVENT &&
aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
aEvent->eventStructType != NS_WHEEL_EVENT &&
aEvent->eventStructType != NS_TOUCH_EVENT &&

View File

@ -111,7 +111,6 @@ nsDOMUIEvent::GetMovementPoint()
if (!mEvent ||
(mEvent->eventStructType != NS_MOUSE_EVENT &&
mEvent->eventStructType != NS_POPUP_EVENT &&
mEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
mEvent->eventStructType != NS_WHEEL_EVENT &&
mEvent->eventStructType != NS_DRAG_EVENT &&
@ -314,7 +313,6 @@ nsDOMUIEvent::GetLayerPoint()
{
if (!mEvent ||
(mEvent->eventStructType != NS_MOUSE_EVENT &&
mEvent->eventStructType != NS_POPUP_EVENT &&
mEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
mEvent->eventStructType != NS_WHEEL_EVENT &&
mEvent->eventStructType != NS_TOUCH_EVENT &&

View File

@ -37,7 +37,6 @@ public:
{
if (!aEvent ||
(aEvent->eventStructType != NS_MOUSE_EVENT &&
aEvent->eventStructType != NS_POPUP_EVENT &&
aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
aEvent->eventStructType != NS_WHEEL_EVENT &&
aEvent->eventStructType != NS_DRAG_EVENT &&
@ -62,7 +61,6 @@ public:
{
if (!aEvent ||
(aEvent->eventStructType != NS_MOUSE_EVENT &&
aEvent->eventStructType != NS_POPUP_EVENT &&
aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT &&
aEvent->eventStructType != NS_WHEEL_EVENT &&
aEvent->eventStructType != NS_DRAG_EVENT &&

View File

@ -724,7 +724,6 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
return NS_NewDOMCompositionEvent(
aDOMEvent, aPresContext, static_cast<nsCompositionEvent*>(aEvent));
case NS_MOUSE_EVENT:
case NS_POPUP_EVENT:
return NS_NewDOMMouseEvent(aDOMEvent, aPresContext,
static_cast<nsInputEvent*>(aEvent));
case NS_MOUSE_SCROLL_EVENT:

View File

@ -56,7 +56,6 @@ enum nsEventStructType {
// Mouse related events
NS_MOUSE_EVENT, // nsMouseEvent
NS_POPUP_EVENT, // nsMouseEvent
NS_MOUSE_SCROLL_EVENT, // nsMouseScrollEvent
NS_DRAG_EVENT, // nsDragEvent
NS_WHEEL_EVENT, // widget::WheelEvent