Backed out changeset 464f978cfca5

This commit is contained in:
Robert O'Callahan 2010-08-12 11:30:44 +12:00
parent 70965c88db
commit cb31d472eb
5 changed files with 2 additions and 9 deletions

View File

@ -665,7 +665,6 @@ nsContentUtils::InitializeEventTable() {
{ nsGkAtoms::onvolumechange, NS_VOLUMECHANGE, EventNameType_HTML, NS_EVENT_NULL },
#endif // MOZ_MEDIA
{ nsGkAtoms::onMozAfterPaint, NS_AFTERPAINT, EventNameType_None, NS_EVENT },
{ nsGkAtoms::onMozBeforePaint, NS_BEFOREPAINT, EventNameType_None, NS_EVENT_NULL },
{ nsGkAtoms::onMozScrolledAreaChanged, NS_SCROLLEDAREACHANGED, EventNameType_None, NS_SCROLLAREA_EVENT },

View File

@ -669,7 +669,6 @@ GK_ATOM(onmouseover, "onmouseover")
GK_ATOM(onMozMouseHittest, "onMozMouseHittest")
GK_ATOM(onmouseup, "onmouseup")
GK_ATOM(onMozAfterPaint, "onMozAfterPaint")
GK_ATOM(onMozBeforePaint, "onMozBeforePaint")
GK_ATOM(onMozMousePixelScroll, "onMozMousePixelScroll")
GK_ATOM(onMozScrolledAreaChanged, "onMozScrolledAreaChanged")
GK_ATOM(ononline, "ononline")

View File

@ -91,7 +91,6 @@ static const char* const sEventNames[] = {
"durationchange", "volumechange",
#endif // MOZ_MEDIA
"MozAfterPaint",
"MozBeforePaint",
"MozSwipeGesture",
"MozMagnifyGestureStart",
"MozMagnifyGestureUpdate",
@ -401,7 +400,7 @@ nsDOMEvent::GetCancelable(PRBool* aCancelable)
NS_IMETHODIMP
nsDOMEvent::GetTimeStamp(PRUint64* aTimeStamp)
{
*aTimeStamp = mEvent->time;
LL_UI2L(*aTimeStamp, mEvent->time);
return NS_OK;
}
@ -1303,8 +1302,6 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
#endif
case NS_AFTERPAINT:
return sEventNames[eDOMEvents_afterpaint];
case NS_BEFOREPAINT:
return sEventNames[eDOMEvents_beforepaint];
case NS_SIMPLE_GESTURE_SWIPE:
return sEventNames[eDOMEvents_MozSwipeGesture];
case NS_SIMPLE_GESTURE_MAGNIFY_START:

View File

@ -170,7 +170,6 @@ public:
eDOMEvents_volumechange,
#endif
eDOMEvents_afterpaint,
eDOMEvents_beforepaint,
eDOMEvents_MozSwipeGesture,
eDOMEvents_MozMagnifyGestureStart,
eDOMEvents_MozMagnifyGestureUpdate,

View File

@ -413,7 +413,6 @@ class nsHashKey;
// paint notification events
#define NS_NOTIFYPAINT_START 3400
#define NS_AFTERPAINT (NS_NOTIFYPAINT_START)
#define NS_BEFOREPAINT (NS_NOTIFYPAINT_START+1)
// Simple gesture events
#define NS_SIMPLE_GESTURE_EVENT_START 3500
@ -535,7 +534,7 @@ public:
nsIntPoint refPoint;
// Elapsed time, in milliseconds, from a platform-specific zero time
// to the time the message was created
PRUint64 time;
PRUint32 time;
// Flags to hold event flow stage and capture/bubble cancellation
// status. This is used also to indicate whether the event is trusted.
PRUint32 flags;