Bug 912956 part.2 Rename nsEvent.h to mozilla/EventForwards.h and sort out it r=roc

--HG--
rename : widget/nsEvent.h => widget/EventForwards.h

content/base/public/Element.h

@@ -33,8 +33,8 @@
 #include "mozilla/dom/Attr.h"
 #include "nsISMILAttr.h"
 #include "nsClientRect.h"
-#include "nsEvent.h"
 #include "nsAttrValue.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "Units.h"
 

content/base/public/nsContentUtils.h

@@ -21,6 +21,7 @@
 #include "js/TypeDecls.h"
 #include "js/RootingAPI.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/TimeStamp.h"
 #include "nsContentListDeclarations.h"
@@ -34,8 +35,6 @@ class imgIRequest;
 class imgLoader;
 class imgRequestProxy;
 class nsAutoScriptBlockerSuppressNodeRemoved;
-class nsDragEvent;
-class nsEvent;
 class nsEventListenerManager;
 class nsHtml5StringParser;
 class nsIChannel;
@@ -84,7 +83,6 @@ class nsIWidget;
 class nsIWordBreaker;
 class nsIXPConnect;
 class nsIXPConnectJSObjectHolder;
-class nsKeyEvent;
 class nsNodeInfoManager;
 class nsPIDOMWindow;
 class nsPresContext;

content/events/public/nsEventDispatcher.h

@@ -7,8 +7,8 @@
 #ifndef nsEventDispatcher_h___
 #define nsEventDispatcher_h___
 
+#include "mozilla/EventForwards.h"
 #include "nsCOMPtr.h"
-#include "nsEvent.h"
 
 class nsEventTargetChainItem;
 class nsIDOMEvent;

content/events/public/nsIPrivateTextEvent.h

@@ -6,7 +6,6 @@
 #ifndef nsIPrivateTextEvent_h__
 #define nsIPrivateTextEvent_h__
 
-#include "nsEvent.h"
 #include "nsISupports.h"
 #include "nsIPrivateTextRange.h"
 

content/events/src/TextComposition.h

@@ -8,12 +8,12 @@
 #define mozilla_TextComposition_h
 
 #include "nsCOMPtr.h"
-#include "nsEvent.h"
 #include "nsINode.h"
 #include "nsIWidget.h"
 #include "nsTArray.h"
 #include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 
 class nsDispatchingCallback;
 class nsIMEStateManager;

content/events/src/Touch.h

@@ -7,12 +7,12 @@
 #define mozilla_dom_Touch_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsWrapperCache.h"
 #include "nsAutoPtr.h"
 #include "Units.h"
 
 class nsPresContext;
-class nsEvent;
 
 namespace mozilla {
 namespace dom {

content/events/src/nsContentEventHandler.h

@@ -10,11 +10,10 @@
 
 #include "nsISelection.h"
 #include "nsRange.h"
+#include "mozilla/EventForwards.h"
 
 class nsCaret;
 class nsPresContext;
-class nsQueryContentEvent;
-class nsSelectionEvent;
 
 struct nsRect;
 

content/events/src/nsDOMUIEvent.h

@@ -10,7 +10,6 @@
 #include "nsIDOMUIEvent.h"
 #include "nsDOMEvent.h"
 #include "nsLayoutUtils.h"
-#include "nsEvent.h"
 #include "mozilla/dom/UIEventBinding.h"
 #include "nsPresContext.h"
 #include "nsDeviceContext.h"

content/events/src/nsEventStateManager.h

@@ -8,7 +8,6 @@
 
 #include "mozilla/TypedEnum.h"
 
-#include "nsEvent.h"
 #include "nsGUIEvent.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
@@ -28,7 +27,6 @@ class nsIDocShellTreeItem;
 class imgIContainer;
 class nsDOMDataTransfer;
 class MouseEnterLeaveDispatcher;
-class nsEventStates;
 class nsIMarkupDocumentViewer;
 class nsIScrollableFrame;
 class nsITimer;

content/events/src/nsIMEStateManager.h

@@ -6,7 +6,7 @@
 #ifndef nsIMEStateManager_h__
 #define nsIMEStateManager_h__
 
-#include "nsEvent.h"
+#include "mozilla/EventForwards.h"
 #include "nsIWidget.h"
 
 class nsDispatchingCallback;

content/svg/content/src/SVGZoomEvent.h

@@ -9,9 +9,9 @@
 #include "nsAutoPtr.h"
 #include "nsDOMUIEvent.h"
 #include "DOMSVGPoint.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/SVGZoomEventBinding.h"
 
-class nsGUIEvent;
 class nsISVGPoint;
 class nsPresContext;
 

docshell/base/nsILinkHandler.h

@@ -6,8 +6,8 @@
 #define nsILinkHandler_h___
 
 #include "nsISupports.h"
+#include "mozilla/EventForwards.h"
 
-class nsGUIEvent;
 class nsIContent;
 class nsIDocShell;
 class nsIInputStream;

dom/base/nsDOMWindowUtils.h

@@ -9,7 +9,6 @@
 #include "nsWeakReference.h"
 
 #include "nsIDOMWindowUtils.h"
-#include "nsEvent.h"
 #include "mozilla/Attributes.h"
 
 class nsGlobalWindow;

dom/base/nsIScriptGlobalObject.h

@@ -8,12 +8,11 @@
 #define nsIScriptGlobalObject_h__
 
 #include "nsISupports.h"
-#include "nsEvent.h"
 #include "nsIGlobalObject.h"
 #include "js/TypeDecls.h"
+#include "mozilla/EventForwards.h"
 
 class nsIScriptContext;
-class nsScriptErrorEvent;
 class nsIScriptGlobalObject;
 
 // A helper function for nsIScriptGlobalObject implementations to use

dom/base/nsPIDOMWindow.h

@@ -52,6 +52,13 @@ enum PopupControlState {
   openOverridden    // disallow window open
 };
 
+enum UIStateChangeType
+{
+  UIStateChangeType_NoChange,
+  UIStateChangeType_Set,
+  UIStateChangeType_Clear
+};
+
 #define NS_PIDOMWINDOW_IID \
 { 0x4f4eadf9, 0xe795, 0x48e5, \
   { 0x89, 0x4b, 0x04, 0x40, 0xb2, 0x5d, 0xa6, 0xfa } }

dom/base/nsQueryContentEventResult.h

@@ -7,8 +7,8 @@
 #include "nsString.h"
 #include "nsRect.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 
-class nsQueryContentEvent;
 class nsIWidget;
 
 class nsQueryContentEventResult MOZ_FINAL : public nsIQueryContentEventResult

dom/interfaces/events/nsIDOMEvent.idl

@@ -17,17 +17,14 @@ interface nsIDOMEventTarget;
 #undef ERROR
 #endif
 
-class nsEvent;
+#include "mozilla/EventForwards.h"
 class nsDOMEvent;
-class nsCommandEvent;
 class nsPresContext;
 class nsInvalidateRequestList;
 namespace IPC {
 class Message;
 }
 namespace mozilla {
-class WheelEvent;
-
 namespace dom {
 class EventTarget;
 } // namespace dom

dom/interfaces/events/nsIDOMEventTarget.idl

@@ -6,7 +6,7 @@
 #include "domstubs.idl"
 
 %{C++
-#include "nsEvent.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/Nullable.h"
 #include "js/TypeDecls.h"
 

dom/plugins/base/nsIPluginInstanceOwner.idl

@@ -11,8 +11,8 @@ interface nsIDocument;
 
 %{C++
 #include "npapi.h"
+#include "mozilla/EventForwards.h"
 class nsNPAPIPluginInstance;
-class nsPluginEvent;
 %}
 
 [ptr] native nsNPAPIPluginInstancePtr(nsNPAPIPluginInstance);

dom/plugins/ipc/PluginLibrary.h

@@ -13,6 +13,7 @@
 #include "nscore.h"
 #include "nsTArray.h"
 #include "nsError.h"
+#include "mozilla/EventForwards.h"
 
 class gfxASurface;
 class gfxContext;
@@ -20,7 +21,6 @@ class nsCString;
 struct nsIntRect;
 struct nsIntSize;
 class nsNPAPIPlugin;
-class nsGUIEvent;
 
 namespace mozilla {
 namespace layers {

editor/libeditor/base/nsEditor.cpp

@@ -44,7 +44,6 @@
 #include "nsEditorEventListener.h"      // for nsEditorEventListener
 #include "nsEditorUtils.h"              // for nsAutoRules, etc
 #include "nsError.h"                    // for NS_OK, etc
-#include "nsEvent.h"                    // for nsEventStatus, etc
 #include "nsFocusManager.h"             // for nsFocusManager
 #include "nsFrameSelection.h"           // for nsFrameSelection
 #include "nsGUIEvent.h"                 // for nsKeyEvent, nsEvent, etc

editor/libeditor/base/nsEditor.h

@@ -7,6 +7,7 @@
 #define __editor_h__
 
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT, etc.
+#include "mozilla/EventForwards.h"      // for nsKeyEvent
 #include "mozilla/TypedEnum.h"          // for MOZ_BEGIN_ENUM_CLASS, etc.
 #include "nsAutoPtr.h"                  // for nsRefPtr
 #include "nsCOMArray.h"                 // for nsCOMArray
@@ -63,7 +64,6 @@ class nsISelection;
 class nsISupports;
 class nsITransaction;
 class nsIWidget;
-class nsKeyEvent;
 class nsRange;
 class nsString;
 class nsTransactionManager;

gfx/layers/Layers.h

@@ -21,6 +21,7 @@
 #include "gfxRect.h"                    // for gfxRect
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT_HELPER2, etc
 #include "mozilla/DebugOnly.h"          // for DebugOnly
+#include "mozilla/EventForwards.h"      // for nsPaintEvent
 #include "mozilla/RefPtr.h"             // for TemporaryRef
 #include "mozilla/TimeStamp.h"          // for TimeStamp, TimeDuration
 #include "mozilla/gfx/BaseMargin.h"     // for BaseMargin
@@ -47,7 +48,6 @@
 
 
 class gfxContext;
-class nsPaintEvent;
 
 extern uint8_t gLayerManagerLayerBuilder;
 

gfx/layers/composite/APZCTreeManager.h

@@ -12,15 +12,14 @@
 #include "gfxPoint.h"                   // for gfxPoint
 #include "gfx3DMatrix.h"                // for gfx3DMatrix
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT_HELPER2
+#include "mozilla/EventForwards.h"      // for nsInputEvent, nsEventStatus
 #include "mozilla/Monitor.h"            // for Monitor
 #include "nsAutoPtr.h"                  // for nsRefPtr
 #include "nsCOMPtr.h"                   // for already_AddRefed
-#include "nsEvent.h"                    // for nsEventStatus
 #include "nsISupportsImpl.h"
 #include "nsTraceRefcnt.h"              // for MOZ_COUNT_CTOR, etc
 
 class gfx3DMatrix;
-class nsInputEvent;
 template <class E> class nsTArray;
 
 namespace mozilla {

gfx/layers/ipc/AsyncPanZoomController.cpp

@@ -41,7 +41,6 @@
 #include "nsAutoPtr.h"                  // for nsRefPtr
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_WARNING
-#include "nsEvent.h"
 #include "nsGUIEvent.h"                 // for nsInputEvent, nsTouchEvent, etc
 #include "nsISupportsImpl.h"
 #include "nsMathUtils.h"                // for NS_hypot

gfx/layers/ipc/AsyncPanZoomController.h

@@ -9,6 +9,7 @@
 
 #include "GeckoContentController.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/ReentrantMonitor.h"
 #include "mozilla/RefPtr.h"
@@ -16,7 +17,6 @@
 #include "Axis.h"
 #include "TaskThrottler.h"
 #include "gfx3DMatrix.h"
-#include "nsEvent.h"
 
 #include "base/message_loop.h"
 

gfx/layers/ipc/GestureEventListener.h

@@ -11,8 +11,8 @@
 #include "InputData.h"                  // for MultiTouchInput, etc
 #include "Units.h"                      // for ScreenIntPoint
 #include "mozilla/Assertions.h"         // for MOZ_ASSERT_HELPER2
+#include "mozilla/EventForwards.h"      // for nsEventStatus
 #include "nsAutoPtr.h"                  // for nsRefPtr
-#include "nsEvent.h"                    // for nsEventStatus
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"                   // for nsTArray
 

layout/base/PositionedEventTargeting.h

@@ -6,9 +6,9 @@
 #define mozilla_PositionedEventTargeting_h
 
 #include <stdint.h>
+#include "mozilla/EventForwards.h"
 
 class nsIFrame;
-class nsGUIEvent;
 struct nsPoint;
 
 namespace mozilla {

layout/base/nsIPresShell.h

@@ -20,6 +20,7 @@
 #ifndef nsIPresShell_h___
 #define nsIPresShell_h___
 
+#include "mozilla/EventForwards.h"
 #include "mozilla/MemoryReporting.h"
 #include "gfxPoint.h"
 #include "nsTHashtable.h"
@@ -28,7 +29,6 @@
 #include "nsQueryFrame.h"
 #include "nsCoord.h"
 #include "nsColor.h"
-#include "nsEvent.h"
 #include "nsCompatibility.h"
 #include "nsFrameManagerBase.h"
 #include "mozFlushType.h"

layout/forms/nsRangeFrame.h

@@ -8,12 +8,12 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Decimal.h"
+#include "mozilla/EventForwards.h"
 #include "nsContainerFrame.h"
 #include "nsIAnonymousContentCreator.h"
 #include "nsCOMPtr.h"
 
 class nsBaseContentList;
-class nsGUIEvent;
 
 class nsRangeFrame : public nsContainerFrame,
                      public nsIAnonymousContentCreator

layout/generic/nsCanvasFrame.h

@@ -9,13 +9,13 @@
 #define nsCanvasFrame_h___
 
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsContainerFrame.h"
 #include "nsIScrollPositionListener.h"
 #include "nsDisplayList.h"
 
 class nsPresContext;
 class nsRenderingContext;
-class nsEvent;
 
 /**
  * Root frame class.

layout/generic/nsFrameSetFrame.h

@@ -19,7 +19,6 @@ struct nsHTMLReflowState;
 struct nsSize;
 class  nsIAtom;
 class  nsHTMLFramesetBorderFrame;
-class  nsGUIEvent;
 class  nsHTMLFramesetFrame;
 
 #define NO_COLOR 0xFFFFFFFA

parser/html/nsHtml5TreeBuilderCppSupplement.h

@@ -6,8 +6,6 @@
 
 #include "nsError.h"
 #include "nsIPresShell.h"
-#include "nsEvent.h"
-#include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsNodeUtils.h"
 #include "nsIFrame.h"

view/public/nsView.h

@@ -11,8 +11,8 @@
 #include "nsPoint.h"
 #include "nsRegion.h"
 #include "nsCRT.h"
-#include "nsEvent.h"
 #include "nsIWidgetListener.h"
+#include "mozilla/EventForwards.h"
 
 class nsViewManager;
 class nsIWidget;

view/public/nsViewManager.h

@@ -8,11 +8,11 @@
 
 #include "nscore.h"
 #include "nsView.h"
-#include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsCRT.h"
 #include "nsVoidArray.h"
 #include "nsDeviceContext.h"
+#include "mozilla/EventForwards.h"
 
 class nsIWidget;
 struct nsRect;

widget/EventForwards.h

@@ -3,87 +3,37 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef nsEvent_h__
-#define nsEvent_h__
+#ifndef mozilla_EventForwards_h__
+#define mozilla_EventForwards_h__
 
 #include <stdint.h>
 
-/*
- * This is in a separate header file because it needs to be included
- * in many places where including nsGUIEvent.h would bring in many
- * header files that are totally unnecessary.
+/**
+ * XXX Following enums should be in BasicEvents.h.  However, currently, it's
+ *     impossible to use foward delearation for enum.
  */
 
-enum UIStateChangeType {
-  UIStateChangeType_NoChange,
-  UIStateChangeType_Set,
-  UIStateChangeType_Clear
-};
-
 /**
  * Return status for event processors.
  */
-
-enum nsEventStatus {  
-    /// The event is ignored, do default processing
-  nsEventStatus_eIgnore,            
-    /// The event is consumed, don't do default processing
-  nsEventStatus_eConsumeNoDefault, 
-    /// The event is consumed, but do default processing
-  nsEventStatus_eConsumeDoDefault  
+enum nsEventStatus
+{
+  // The event is ignored, do default processing
+  nsEventStatus_eIgnore,
+  // The event is consumed, don't do default processing
+  nsEventStatus_eConsumeNoDefault,
+  // The event is consumed, but do default processing
+  nsEventStatus_eConsumeDoDefault
 };
 
-/**
- * sizemode is an adjunct to widget size
- */
-enum nsSizeMode {
-  nsSizeMode_Normal = 0,
-  nsSizeMode_Minimized,
-  nsSizeMode_Maximized,
-  nsSizeMode_Fullscreen
-};
-
-struct nsAlternativeCharCode;
-struct nsTextRangeStyle;
-struct nsTextRange;
-
-class nsEvent;
-class nsGUIEvent;
-class nsScriptErrorEvent;
-class nsScrollbarEvent;
-class nsScrollPortEvent;
-class nsScrollAreaEvent;
-class nsInputEvent;
-class nsMouseEvent_base;
-class nsMouseEvent;
-class nsDragEvent;
-class nsKeyEvent;
-class nsTextEvent;
-class nsCompositionEvent;
-class nsMouseScrollEvent;
-class nsGestureNotifyEvent;
-class nsQueryContentEvent;
-class nsFocusEvent;
-class nsSelectionEvent;
-class nsContentCommandEvent;
-class nsTouchEvent;
-class nsFormEvent;
-class nsCommandEvent;
-class nsUIEvent;
-class nsSimpleGestureEvent;
-class nsTransitionEvent;
-class nsAnimationEvent;
-class nsPluginEvent;
-
 namespace mozilla {
 
-struct EventFlags;
-
-class WheelEvent;
-
-// All modifier keys should be defined here.  This is used for managing
-// modifier states for DOM Level 3 or later.
-enum Modifier {
+/**
+ * All modifier keys should be defined here.  This is used for managing
+ * modifier states for DOM Level 3 or later.
+ */
+enum Modifier
+{
   MODIFIER_ALT        = 0x0001,
   MODIFIER_ALTGRAPH   = 0x0002,
   MODIFIER_CAPSLOCK   = 0x0004,
@@ -102,7 +52,8 @@ typedef uint16_t Modifiers;
 #define NS_DEFINE_KEYNAME(aCPPName, aDOMKeyName) \
   KEY_NAME_INDEX_##aCPPName,
 
-enum KeyNameIndex {
+enum KeyNameIndex
+{
 #include "nsDOMKeyNameList.h"
   // There shouldn't be "," at the end of enum definition, this dummy item
   // avoids bustage on some platforms.
@@ -113,16 +64,62 @@ enum KeyNameIndex {
 
 } // namespace mozilla
 
-#define NS_DOM_KEYNAME_ALT        "Alt"
-#define NS_DOM_KEYNAME_ALTGRAPH   "AltGraph"
-#define NS_DOM_KEYNAME_CAPSLOCK   "CapsLock"
-#define NS_DOM_KEYNAME_CONTROL    "Control"
-#define NS_DOM_KEYNAME_FN         "Fn"
-#define NS_DOM_KEYNAME_META       "Meta"
-#define NS_DOM_KEYNAME_NUMLOCK    "NumLock"
-#define NS_DOM_KEYNAME_SCROLLLOCK "ScrollLock"
-#define NS_DOM_KEYNAME_SHIFT      "Shift"
-#define NS_DOM_KEYNAME_SYMBOLLOCK "SymbolLock"
-#define NS_DOM_KEYNAME_OS         "OS"
+/**
+ * All header files should include this header instead of *Events.h.
+ */
 
-#endif // nsEvent_h__
+// BasicEvents.h
+namespace mozilla {
+struct EventFlags;
+} // namespace mozilla
+
+class nsEvent;
+class nsGUIEvent;
+class nsInputEvent;
+class nsUIEvent;
+
+// TextEvents.h
+struct nsAlternativeCharCode;
+struct nsTextRangeStyle;
+struct nsTextRange;
+
+class nsKeyEvent;
+class nsTextEvent;
+class nsCompositionEvent;
+class nsQueryContentEvent;
+class nsSelectionEvent;
+
+// MouseEvents.h
+class nsMouseEvent_base;
+class nsMouseEvent;
+class nsDragEvent;
+class nsMouseScrollEvent;
+
+namespace mozilla {
+class WheelEvent;
+} // namespace mozilla
+
+// TouchEvents.h
+class nsGestureNotifyEvent;
+class nsTouchEvent;
+class nsSimpleGestureEvent;
+
+// ContentEvents.h
+class nsScriptErrorEvent;
+class nsScrollPortEvent;
+class nsScrollAreaEvent;
+class nsFormEvent;
+class nsClipboardEvent;
+class nsFocusEvent;
+class nsTransitionEvent;
+class nsAnimationEvent;
+
+// MiscEvents.h
+class nsCommandEvent;
+class nsContentCommandEvent;
+class nsPluginEvent;
+
+// content/events/public/nsMutationEvent.h
+class nsMutationEvent;
+
+#endif // mozilla_EventForwards_h__

widget/InputData.h

@@ -10,9 +10,8 @@
 #include "nsPoint.h"
 #include "nsTArray.h"
 #include "Units.h"
+#include "mozilla/EventForwards.h"
 
-class nsTouchEvent;
-class nsMouseEvent;
 namespace mozilla {
 
 

widget/cocoa/TextInputHandler.h

@@ -17,10 +17,9 @@
 #include "nsITimer.h"
 #include "npapi.h"
 #include "nsTArray.h"
-#include "nsEvent.h"
+#include "mozilla/EventForwards.h"
 
 class nsChildView;
-struct nsTextRange;
 
 namespace mozilla {
 namespace widget {

widget/cocoa/nsCocoaUtils.h

@@ -10,13 +10,14 @@
 
 #include "nsRect.h"
 #include "imgIContainer.h"
-#include "nsEvent.h"
 #include "npapi.h"
 #include "nsTArray.h"
 
 // This must be the last include:
 #include "nsObjCExceptions.h"
 
+#include "mozilla/EventForwards.h"
+
 // Declare the backingScaleFactor method that we want to call
 // on NSView/Window/Screen objects, if they recognize it.
 @interface NSObject (BackingScaleFactorCategory)

widget/cocoa/nsMenuUtilsX.h

@@ -7,7 +7,6 @@
 #define nsMenuUtilsX_h_
 
 #include "nscore.h"
-#include "nsEvent.h"
 #include "nsMenuBaseX.h"
 
 #import <Cocoa/Cocoa.h>

widget/cocoa/nsStandaloneNativeMenu.mm

@@ -9,7 +9,6 @@
 #include "nsMenuUtilsX.h"
 #include "nsIDOMElement.h"
 #include "nsIMutationObserver.h"
-#include "nsEvent.h"
 #include "nsGUIEvent.h"
 #include "nsGkAtoms.h"
 #include "nsObjCExceptions.h"

widget/gonk/GonkKeyMapping.h

@@ -16,8 +16,8 @@
 #ifndef GONKKEYMAPPING_H
 #define GONKKEYMAPPING_H
 
-#include "nsEvent.h"
 #include "libui/android_keycodes.h"
+#include "mozilla/EventForwards.h"
 
 namespace mozilla {
 namespace widget {

widget/gtk/nsGtkKeyUtils.h

@@ -8,8 +8,8 @@
 #ifndef __nsGdkKeyUtils_h__
 #define __nsGdkKeyUtils_h__
 
-#include "nsEvent.h"
 #include "nsTArray.h"
+#include "mozilla/EventForwards.h"
 
 #include <gdk/gdk.h>
 

widget/moz.build

@@ -99,7 +99,6 @@ MODULE = 'widget'
 
 EXPORTS += [
     'InputData.h',
-    'nsEvent.h',
     'nsGUIEvent.h',
     'nsIDeviceContextSpec.h',
     'nsINativeKeyBindings.h',
@@ -112,6 +111,7 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla += [
+    'EventForwards.h',
     'LookAndFeel.h',
     'WidgetUtils.h',
 ]

widget/nsGUIEvent.h

@@ -10,7 +10,6 @@
 
 #include "nsPoint.h"
 #include "nsRect.h"
-#include "nsEvent.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
@@ -25,6 +24,7 @@
 #include "nsITransferable.h"
 #include "nsStyleConsts.h"
 #include "nsAutoPtr.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/Touch.h"
 #include "Units.h"
@@ -477,18 +477,19 @@ enum nsEventStructType {
 #endif
 
 /**
- * Return status for event processors, nsEventStatus, is defined in
- * nsEvent.h.
+ * Modifier key names.
  */
-
-/**
- * different types of (top-level) window z-level positioning
- */
-enum nsWindowZ {
-  nsWindowZTop = 0,   // on top
-  nsWindowZBottom,    // on bottom
-  nsWindowZRelative   // just below some specified widget
-};
+#define NS_DOM_KEYNAME_ALT        "Alt"
+#define NS_DOM_KEYNAME_ALTGRAPH   "AltGraph"
+#define NS_DOM_KEYNAME_CAPSLOCK   "CapsLock"
+#define NS_DOM_KEYNAME_CONTROL    "Control"
+#define NS_DOM_KEYNAME_FN         "Fn"
+#define NS_DOM_KEYNAME_META       "Meta"
+#define NS_DOM_KEYNAME_NUMLOCK    "NumLock"
+#define NS_DOM_KEYNAME_SCROLLLOCK "ScrollLock"
+#define NS_DOM_KEYNAME_SHIFT      "Shift"
+#define NS_DOM_KEYNAME_SYMBOLLOCK "SymbolLock"
+#define NS_DOM_KEYNAME_OS         "OS"
 
 namespace mozilla {
 

widget/nsINativeKeyBindings.h

@@ -7,7 +7,7 @@
 #define nsINativeKeyBindings_h_
 
 #include "nsISupports.h"
-#include "nsEvent.h"
+#include "mozilla/EventForwards.h"
 
 #define NS_INATIVEKEYBINDINGS_IID \
 {0xc2baecc3, 0x1758, 0x4211, {0x96, 0xbe, 0xee, 0x1b, 0x1b, 0x7c, 0xd7, 0x6d}}

widget/nsIWidget.h

@@ -11,11 +11,11 @@
 #include "nsRect.h"
 #include "nsString.h"
 
-#include "nsEvent.h"
 #include "nsCOMPtr.h"
 #include "nsWidgetInitData.h"
 #include "nsTArray.h"
 #include "nsXULAppAPI.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/RefPtr.h"
 #include "Units.h"
@@ -26,7 +26,6 @@ class   nsRenderingContext;
 class   nsDeviceContext;
 struct  nsFont;
 class   nsIRollupListener;
-class   nsGUIEvent;
 class   imgIContainer;
 class   gfxASurface;
 class   nsIContent;

widget/nsIWidgetListener.h

@@ -13,6 +13,27 @@
 class nsView;
 class nsIPresShell;
 
+/**
+ * sizemode is an adjunct to widget size
+ */
+enum nsSizeMode
+{
+  nsSizeMode_Normal = 0,
+  nsSizeMode_Minimized,
+  nsSizeMode_Maximized,
+  nsSizeMode_Fullscreen
+};
+
+/**
+ * different types of (top-level) window z-level positioning
+ */
+enum nsWindowZ
+{
+  nsWindowZTop = 0,   // on top
+  nsWindowZBottom,    // on bottom
+  nsWindowZRelative   // just below some specified widget
+};
+
 class nsIWidgetListener
 {
 public:

widget/qt/nsQtKeyUtils.h

@@ -8,7 +8,7 @@
 #ifndef __nsQtKeyUtils_h__
 #define __nsQtKeyUtils_h__
 
-#include "nsEvent.h"
+#include "mozilla/EventForwards.h"
 
 int      QtKeyCodeToDOMKeyCode     (int aKeysym);
 int      DOMKeyCodeToQtKeyCode     (int aKeysym);

widget/shared/WidgetUtils.h

@@ -9,9 +9,9 @@
 
 #include "nsCOMPtr.h"
 #include "nsIWidget.h"
-#include "nsEvent.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDOMWindow.h"
+#include "mozilla/EventForwards.h"
 
 namespace mozilla {
 namespace widget {

widget/windows/KeyboardLayout.h

@@ -8,10 +8,10 @@
 
 #include "nscore.h"
 #include "nsAutoPtr.h"
-#include "nsEvent.h"
 #include "nsString.h"
 #include "nsWindowBase.h"
 #include "nsWindowDefs.h"
+#include "mozilla/EventForwards.h"
 #include <windows.h>
 
 #define NS_NUM_OF_KEYS          70

widget/windows/WinIMEHandler.h

@@ -7,7 +7,6 @@
 #define WinIMEHandler_h_
 
 #include "nscore.h"
-#include "nsEvent.h"
 #include "nsIWidget.h"
 #include <windows.h>
 #include <inputscope.h>

widget/windows/WinMouseScrollHandler.h

@@ -9,8 +9,8 @@
 
 #include "nscore.h"
 #include "nsDebug.h"
-#include "nsEvent.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/TimeStamp.h"
 #include <windows.h>
 

widget/windows/nsTextStore.h

@@ -32,7 +32,6 @@ struct ITfDocumentMgr;
 struct ITfDisplayAttributeMgr;
 struct ITfCategoryMgr;
 class nsWindow;
-class nsTextEvent;
 #ifdef MOZ_METRO
 class MetroWidget;
 #endif

widget/windows/nsWindow.h

@@ -18,12 +18,12 @@
 #include "nsToolkit.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsEvent.h"
 #include "gfxWindowsSurface.h"
 #include "nsWindowDbg.h"
 #include "cairo.h"
 #include "nsITimer.h"
 #include "nsRegion.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/TimeStamp.h"
 #include "nsMargin.h"
 

widget/windows/winrt/MetroInput.h

@@ -8,10 +8,10 @@
 // Moz headers (alphabetical)
 #include "keyboardlayout.h"   // mModifierKeyState
 #include "nsBaseHashtable.h"  // mTouches
-#include "nsGUIEvent.h"       // mTouchEvent (nsTouchEvent)
 #include "nsHashKeys.h"       // type of key for mTouches
 #include "mozwrlbase.h"
 #include "nsDeque.h"
+#include "mozilla/EventForwards.h"
 
 // System headers (alphabetical)
 #include <EventToken.h>     // EventRegistrationToken
@@ -21,8 +21,6 @@
 
 // Moz forward declarations
 class MetroWidget;
-enum nsEventStatus;
-class nsGUIEvent;
 struct nsIntPoint;
 
 namespace mozilla {

widget/xpwidgets/nsBaseWidget.h

@@ -16,6 +16,8 @@
 #include "nsAutoPtr.h"
 #include "nsIRollupListener.h"
 #include "nsIObserver.h"
+#include "nsIWidgetListener.h"
+#include "nsPIDOMWindow.h"
 #include <algorithm>
 class nsIContent;
 class nsAutoRollup;

xpfe/appshell/src/nsWebShellWindow.h

@@ -7,7 +7,6 @@
 #define nsWebShellWindow_h__
 
 #include "mozilla/Mutex.h"
-#include "nsEvent.h"
 #include "nsIWebProgressListener.h"
 #include "nsITimer.h"
 #include "nsCOMPtr.h"

xpfe/appshell/src/nsXULWindow.h

@@ -28,9 +28,9 @@
 #include "nsIXULWindow.h"
 #include "nsIPrompt.h"
 #include "nsIAuthPrompt.h"
-#include "nsGUIEvent.h"
 #include "nsIXULBrowserWindow.h"
 #include "nsIWeakReference.h"
+#include "nsIWidgetListener.h"
 
 namespace mozilla {
 namespace dom {