Bug 807226 part 1. Make it easier to do special things with beforeunload and error events as needed. r=smaug

This commit is contained in:
Boris Zbarsky 2012-11-09 08:00:24 -08:00
parent 80ce9e7dce
commit 919e69b93a

View File

@ -129,6 +129,24 @@
#define DEFINED_NON_IDL_EVENT
#endif /* NON_IDL_EVENT */
#ifdef DEFINED_ERROR_EVENT
#error "Don't define DEFINED_ERROR_EVENT"
#endif /* DEFINED_ERROR_EVENT */
#ifndef ERROR_EVENT
#define ERROR_EVENT FORWARDED_EVENT
#define DEFINED_ERROR_EVENT
#endif /* ERROR_EVENT */
#ifdef DEFINED_BEFOREUNLOAD_EVENT
#error "Don't define DEFINED_BEFOREUNLOAD_EVENT"
#endif /* DEFINED_BEFOREUNLOAD_EVENT */
#ifndef BEFOREUNLOAD_EVENT
#define BEFOREUNLOAD_EVENT WINDOW_EVENT
#define DEFINED_BEFOREUNLOAD_EVENT
#endif /* BEFOREUNLOAD_EVENT */
EVENT(abort,
NS_IMAGE_ABORT,
(EventNameType_HTMLXUL | EventNameType_SVGSVG),
@ -371,10 +389,10 @@ FORWARDED_EVENT(blur,
NS_BLUR_CONTENT,
EventNameType_HTMLXUL,
NS_FOCUS_EVENT)
FORWARDED_EVENT(error,
NS_LOAD_ERROR,
(EventNameType_HTMLXUL | EventNameType_SVGSVG),
NS_EVENT)
ERROR_EVENT(error,
NS_LOAD_ERROR,
(EventNameType_HTMLXUL | EventNameType_SVGSVG),
NS_EVENT)
FORWARDED_EVENT(focus,
NS_FOCUS_CONTENT,
EventNameType_HTMLXUL,
@ -396,10 +414,10 @@ WINDOW_EVENT(beforeprint,
NS_BEFOREPRINT,
EventNameType_HTMLXUL,
NS_EVENT)
WINDOW_EVENT(beforeunload,
NS_BEFORE_PAGE_UNLOAD,
EventNameType_HTMLXUL,
NS_EVENT)
BEFOREUNLOAD_EVENT(beforeunload,
NS_BEFORE_PAGE_UNLOAD,
EventNameType_HTMLXUL,
NS_EVENT)
WINDOW_EVENT(hashchange,
NS_HASHCHANGE,
EventNameType_HTMLXUL,
@ -820,6 +838,16 @@ NON_IDL_EVENT(animationiteration,
#undef NON_IDL_EVENT
#endif /* DEFINED_NON_IDL_EVENT */
#ifdef DEFINED_ERROR_EVENT
#undef DEFINED_ERROR_EVENT
#undef ERROR_EVENT
#endif /* DEFINED_ERROR_EVENT */
#ifdef DEFINED_BEFOREUNLOAD_EVENT
#undef DEFINED_BEFOREUNLOAD_EVENT
#undef BEFOREUNLOAD_EVENT
#endif /* BEFOREUNLOAD_EVENT */
#ifdef ID_TO_EVENT
#undef EVENT
#undef WINDOW_ONLY_EVENT