Bug 912956 part.15 mozilla/TextEvents.h should be included directly r=roc

content/base/src/Element.cpp

@@ -50,6 +50,7 @@
 #include "nsIDOMMutationEvent.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
 #include "nsNodeUtils.h"
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "nsDocument.h"

content/base/src/nsContentUtils.cpp

@@ -42,6 +42,7 @@
 #include "mozilla/MutationEvent.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Selection.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 #include "nsAString.h"
 #include "nsAttrName.h"

content/events/src/TextComposition.cpp

@@ -8,11 +8,12 @@
 #include "nsContentEventHandler.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsIMEStateManager.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
+#include "mozilla/MiscEvents.h"
+#include "mozilla/TextEvents.h"
 
 namespace mozilla {
 

content/events/src/nsDOMCompositionEvent.cpp

@@ -6,6 +6,7 @@
 
 #include "nsDOMCompositionEvent.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,

content/events/src/nsDOMCompositionEvent.h

@@ -10,6 +10,7 @@
 #include "nsDOMUIEvent.h"
 #include "nsIDOMCompositionEvent.h"
 #include "mozilla/dom/CompositionEventBinding.h"
+#include "mozilla/TextEvents.h"
 
 class nsDOMCompositionEvent : public nsDOMUIEvent,
                               public nsIDOMCompositionEvent

content/events/src/nsDOMEvent.cpp

@@ -16,6 +16,7 @@
 #include "nsIDocument.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "nsContentUtils.h"
 #include "nsJSEnvironment.h"

content/events/src/nsDOMKeyboardEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMKeyboardEvent.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMKeyboardEvent::nsDOMKeyboardEvent(mozilla::dom::EventTarget* aOwner,
                                        nsPresContext* aPresContext,

content/events/src/nsDOMKeyboardEvent.h

@@ -8,7 +8,9 @@
 
 #include "nsIDOMKeyEvent.h"
 #include "nsDOMUIEvent.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/TextEvents.h"
 
 class nsDOMKeyboardEvent : public nsDOMUIEvent,
                            public nsIDOMKeyEvent

content/events/src/nsDOMTextEvent.cpp

@@ -7,6 +7,7 @@
 #include "nsDOMTextEvent.h"
 #include "nsPrivateTextRange.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMTextEvent::nsDOMTextEvent(mozilla::dom::EventTarget* aOwner,
                                nsPresContext* aPresContext,

content/events/src/nsDOMTextEvent.h

@@ -7,6 +7,7 @@
 #define nsDOMTextEvent_h__
 
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsDOMUIEvent.h"
 #include "nsIPrivateTextEvent.h"
 #include "nsPrivateTextRange.h"

content/events/src/nsDOMUIEvent.cpp

@@ -16,6 +16,7 @@
 #include "nsIFrame.h"
 #include "mozilla/Util.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/TextEvents.h"
 #include "prtime.h"
 
 using namespace mozilla;

content/events/src/nsEventDispatcher.cpp

@@ -19,6 +19,7 @@
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 
 using namespace mozilla;

content/events/src/nsEventStateManager.cpp

@@ -7,6 +7,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/MathAlgorithms.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/dom/TabParent.h"
 

content/events/src/nsIMEStateManager.cpp

@@ -29,10 +29,10 @@
 #include "nsIForm.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TextEvents.h"
 #include "TextComposition.h"
 #include "mozilla/Preferences.h"
 #include "nsAsyncDOMEvent.h"
-#include "nsGUIEvent.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;

content/events/src/nsPrivateTextRange.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsPrivateTextRange.h"
-
+#include "mozilla/TextEvents.h"
 
 nsPrivateTextRange::nsPrivateTextRange(const nsTextRange &aTextRange)
   : mRangeStart(uint16_t(aTextRange.mStartOffset)),

content/html/content/src/HTMLButtonElement.cpp

@@ -24,6 +24,7 @@
 #include "nsIDocument.h"
 #include "nsGUIEvent.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "nsUnicharUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsEventDispatcher.h"

content/html/content/src/HTMLInputElement.cpp

@@ -59,6 +59,7 @@
 
 #include "nsIDOMMutationEvent.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "nsEventListenerManager.h"
 

content/html/content/src/nsTextEditorState.cpp

@@ -42,6 +42,7 @@
 #include "mozilla/Preferences.h"
 #include "nsTextNode.h"
 #include "nsIController.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/smil/nsSMILTimeValueSpec.cpp

@@ -12,7 +12,7 @@
 #include "nsSMILInstanceTime.h"
 #include "nsSMILParserUtils.h"
 #include "nsEventListenerManager.h"
-#include "nsGUIEvent.h"
+#include "nsIDOMKeyEvent.h"
 #include "nsIDOMTimeEvent.h"
 #include "nsString.h"
 #include <limits>

content/xbl/src/nsXBLWindowKeyHandler.cpp

@@ -29,6 +29,7 @@
 #include "nsISelectionController.h"
 #include "nsGUIEvent.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/dom/Element.h"
 #include "nsEventStateManager.h"
 

dom/base/CompositionStringSynthesizer.cpp

@@ -11,6 +11,7 @@
 #include "nsIWidget.h"
 #include "nsPIDOMWindow.h"
 #include "nsView.h"
+#include "mozilla/TextEvents.h"
 
 namespace mozilla {
 namespace dom {

dom/base/CompositionStringSynthesizer.h

@@ -7,11 +7,11 @@
 #define mozilla_dom_compositionstringsynthesizer_h__
 
 #include "nsICompositionStringSynthesizer.h"
-#include "nsGUIEvent.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TextEvents.h"
 
 class nsIWidget;
 class nsPIDOMWindow;

dom/base/DOMRequest.cpp

@@ -10,6 +10,7 @@
 #include "nsCxPusher.h"
 #include "nsThreadUtils.h"
 #include "DOMCursor.h"
+#include "nsIDOMEvent.h"
 
 using mozilla::dom::DOMRequest;
 using mozilla::dom::DOMRequestService;

dom/base/nsDOMWindowUtils.cpp

@@ -35,6 +35,7 @@
 #include "nsJSUtils.h"
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 
 #include "nsViewManager.h"

dom/base/nsQueryContentEventResult.cpp

@@ -4,9 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsQueryContentEventResult.h"
-#include "nsGUIEvent.h"
 #include "nsIWidget.h"
 #include "nsPoint.h"
+#include "mozilla/TextEvents.h"
 
 NS_INTERFACE_MAP_BEGIN(nsQueryContentEventResult)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIQueryContentEventResult)

dom/ipc/TabChild.cpp

@@ -25,6 +25,7 @@
 #include "mozilla/layout/RenderFrameChild.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/unused.h"
 #include "mozIApplication.h"

dom/ipc/TabParent.cpp

@@ -20,6 +20,7 @@
 #include "mozilla/layout/RenderFrameParent.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/unused.h"
 #include "nsCOMPtr.h"

dom/plugins/base/nsPluginInstanceOwner.cpp

@@ -60,6 +60,7 @@ using mozilla::DefaultXDisplay;
 #include "nsIDOMHTMLCollection.h"
 #include "GLContext.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsContentCID.h"
 #include "nsWidgetsCID.h"

dom/system/gonk/AudioChannelManager.cpp

@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIDOMClassInfo.h"
+#include "nsIDOMEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"

editor/libeditor/base/IMETextTxn.cpp

@@ -5,11 +5,11 @@
 
 #include "IMETextTxn.h"
 #include "mozilla/mozalloc.h"           // for operator new
+#include "mozilla/TextEvents.h"      // for nsTextRangeStyle
 #include "nsAString.h"                  // for nsAString_internal::Length, etc
 #include "nsAutoPtr.h"                  // for nsRefPtr
 #include "nsDebug.h"                    // for NS_ASSERTION, etc
 #include "nsError.h"                    // for NS_SUCCEEDED, NS_FAILED, etc
-#include "nsGUIEvent.h"                 // for nsTextRangeStyle
 #include "nsIDOMCharacterData.h"        // for nsIDOMCharacterData
 #include "nsIDOMRange.h"                // for nsRange::SetEnd, etc
 #include "nsIContent.h"                 // for nsIContent

editor/libeditor/base/nsEditor.cpp

@@ -27,6 +27,7 @@
 #include "mozilla/Preferences.h"        // for Preferences
 #include "mozilla/Selection.h"          // for Selection, etc
 #include "mozilla/Services.h"           // for GetObserverService
+#include "mozilla/TextEvents.h"
 #include "mozilla/dom/Element.h"        // for Element, nsINode::AsElement
 #include "mozilla/mozalloc.h"           // for operator new, etc
 #include "nsAString.h"                  // for nsAString_internal::Length, etc

editor/libeditor/html/nsHTMLEditor.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/DebugOnly.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsCRT.h"
 

editor/libeditor/text/nsPlaintextEditor.cpp

@@ -7,6 +7,7 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Selection.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/mozalloc.h"
 #include "nsAString.h"

layout/base/nsPresShell.cpp

@@ -22,6 +22,7 @@
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/Util.h"
 #include <algorithm>

layout/base/nsPresShell.h

@@ -37,6 +37,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 
 class nsRange;
 class nsIDragService;

layout/forms/nsListControlFrame.cpp

@@ -30,6 +30,7 @@
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 #include <algorithm>
 
 using namespace mozilla;

layout/generic/Selection.h

@@ -9,12 +9,12 @@
 
 #include "nsIWeakReference.h"
 
-#include "nsGUIEvent.h"
 #include "nsISelection.h"
 #include "nsISelectionController.h"
 #include "nsISelectionPrivate.h"
 #include "nsRange.h"
 #include "nsThreadUtils.h"
+#include "mozilla/TextEvents.h"
 
 struct CachedOffsetForFrame;
 class nsAutoScrollTimer;

layout/generic/nsFrameSelection.h

@@ -8,6 +8,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/EventForwards.h"
 #include "mozilla/Selection.h"
+#include "mozilla/TextEvents.h"
 #include "nsIFrame.h"
 #include "nsIContent.h"
 #include "nsISelectionController.h"

layout/generic/nsSelection.cpp

@@ -56,6 +56,7 @@ static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
 #include "nsCaret.h"
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsITimer.h"
 #include "nsFrameManager.h"

layout/generic/nsTextFrame.cpp

@@ -11,6 +11,7 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsCOMPtr.h"
 #include "nsBlockFrame.h"

layout/xul/base/public/nsXULPopupManager.h

@@ -11,7 +11,6 @@
 #define nsXULPopupManager_h__
 
 #include "prlog.h"
-#include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsIRollupListener.h"
 #include "nsIDOMEventListener.h"
@@ -22,6 +21,7 @@
 #include "nsIReflowCallback.h"
 #include "nsThreadUtils.h"
 #include "nsStyleConsts.h"
+#include "nsWidgetInitData.h"
 #include "mozilla/Attributes.h"
 
 // X.h defines KeyPress
@@ -103,11 +103,6 @@ enum nsNavigationDirection {
                                             dir == eNavigationDirection_Last)
 
 PR_STATIC_ASSERT(NS_STYLE_DIRECTION_LTR == 0 && NS_STYLE_DIRECTION_RTL == 1);
-PR_STATIC_ASSERT((NS_VK_HOME == NS_VK_END + 1) &&
-                 (NS_VK_LEFT == NS_VK_END + 2) &&
-                 (NS_VK_UP == NS_VK_END + 3) &&
-                 (NS_VK_RIGHT == NS_VK_END + 4) &&
-                 (NS_VK_DOWN == NS_VK_END + 5));
 
 /**
  * DirectionFromKeyCodeTable: two arrays, the first for left-to-right and the
@@ -118,7 +113,7 @@ extern const nsNavigationDirection DirectionFromKeyCodeTable[2][6];
 
 #define NS_DIRECTION_FROM_KEY_CODE(frame, keycode)                     \
   (DirectionFromKeyCodeTable[frame->StyleVisibility()->mDirection]  \
-                            [keycode - NS_VK_END])
+                            [keycode - nsIDOMKeyEvent::DOM_VK_END])
 
 // nsMenuChainItem holds info about an open popup. Items are stored in a
 // doubly linked list. Note that the linked list is stored beginning from

layout/xul/base/src/nsButtonBoxFrame.cpp

@@ -17,6 +17,7 @@
 #include "nsDisplayList.h"
 #include "nsContentUtils.h"
 #include "mozilla/dom/Element.h"
+#include "mozilla/TextEvents.h"
 
 
 //

layout/xul/base/src/nsMenuBarFrame.cpp

@@ -26,6 +26,7 @@
 #endif
 #include "nsContentUtils.h"
 #include "nsUTF8Utils.h"
+#include "mozilla/TextEvents.h"
 
 
 //

layout/xul/base/src/nsMenuBarListener.cpp

@@ -20,6 +20,7 @@
 
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 

layout/xul/base/src/nsMenuBoxObject.cpp

@@ -5,8 +5,8 @@
 #include "nsISupportsUtils.h"
 #include "nsIMenuBoxObject.h"
 #include "nsBoxObject.h"
+#include "nsIDOMKeyEvent.h"
 #include "nsIFrame.h"
-#include "nsGUIEvent.h"
 #include "nsMenuBarFrame.h"
 #include "nsMenuBarListener.h"
 #include "nsMenuFrame.h"
@@ -105,10 +105,10 @@ NS_IMETHODIMP nsMenuBoxObject::HandleKeyPress(nsIDOMKeyEvent* aKeyEvent, bool* a
   uint32_t keyCode;
   aKeyEvent->GetKeyCode(&keyCode);
   switch (keyCode) {
-    case NS_VK_UP:
-    case NS_VK_DOWN:
-    case NS_VK_HOME:
-    case NS_VK_END:
+    case nsIDOMKeyEvent::DOM_VK_UP:
+    case nsIDOMKeyEvent::DOM_VK_DOWN:
+    case nsIDOMKeyEvent::DOM_VK_HOME:
+    case nsIDOMKeyEvent::DOM_VK_END:
     {
       nsNavigationDirection theDirection;
       theDirection = NS_DIRECTION_FROM_KEY_CODE(popupFrame, keyCode);

layout/xul/base/src/nsMenuFrame.cpp

@@ -43,6 +43,7 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/dom/Element.h"
 #include <algorithm>
 

layout/xul/base/src/nsXULPopupManager.cpp

@@ -29,6 +29,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIBaseWindow.h"
+#include "nsIDOMKeyEvent.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsCaret.h"
 #include "nsIDocument.h"
@@ -43,22 +44,29 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
+static_assert(nsIDOMKeyEvent::DOM_VK_HOME  == nsIDOMKeyEvent::DOM_VK_END + 1 &&
+              nsIDOMKeyEvent::DOM_VK_LEFT  == nsIDOMKeyEvent::DOM_VK_END + 2 &&
+              nsIDOMKeyEvent::DOM_VK_UP    == nsIDOMKeyEvent::DOM_VK_END + 3 &&
+              nsIDOMKeyEvent::DOM_VK_RIGHT == nsIDOMKeyEvent::DOM_VK_END + 4 &&
+              nsIDOMKeyEvent::DOM_VK_DOWN  == nsIDOMKeyEvent::DOM_VK_END + 5,
+              "nsXULPopupManager assumes some keyCode values are consecutive");
+
 const nsNavigationDirection DirectionFromKeyCodeTable[2][6] = {
   {
-    eNavigationDirection_Last,   // NS_VK_END
-    eNavigationDirection_First,  // NS_VK_HOME
-    eNavigationDirection_Start,  // NS_VK_LEFT
-    eNavigationDirection_Before, // NS_VK_UP
-    eNavigationDirection_End,    // NS_VK_RIGHT
-    eNavigationDirection_After   // NS_VK_DOWN
+    eNavigationDirection_Last,   // nsIDOMKeyEvent::DOM_VK_END
+    eNavigationDirection_First,  // nsIDOMKeyEvent::DOM_VK_HOME
+    eNavigationDirection_Start,  // nsIDOMKeyEvent::DOM_VK_LEFT
+    eNavigationDirection_Before, // nsIDOMKeyEvent::DOM_VK_UP
+    eNavigationDirection_End,    // nsIDOMKeyEvent::DOM_VK_RIGHT
+    eNavigationDirection_After   // nsIDOMKeyEvent::DOM_VK_DOWN
   },
   {
-    eNavigationDirection_Last,   // NS_VK_END
-    eNavigationDirection_First,  // NS_VK_HOME
-    eNavigationDirection_End,    // NS_VK_LEFT
-    eNavigationDirection_Before, // NS_VK_UP
-    eNavigationDirection_Start,  // NS_VK_RIGHT
-    eNavigationDirection_After   // NS_VK_DOWN
+    eNavigationDirection_Last,   // nsIDOMKeyEvent::DOM_VK_END
+    eNavigationDirection_First,  // nsIDOMKeyEvent::DOM_VK_HOME
+    eNavigationDirection_End,    // nsIDOMKeyEvent::DOM_VK_LEFT
+    eNavigationDirection_Before, // nsIDOMKeyEvent::DOM_VK_UP
+    eNavigationDirection_Start,  // nsIDOMKeyEvent::DOM_VK_RIGHT
+    eNavigationDirection_After   // nsIDOMKeyEvent::DOM_VK_DOWN
   }
 };
 

widget/android/nsWindow.cpp

@@ -8,6 +8,7 @@
 #include <unistd.h>
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 
 #include "mozilla/dom/ContentParent.h"

widget/android/nsWindow.h

@@ -12,6 +12,7 @@
 #include "nsTArray.h"
 #include "AndroidJavaWrappers.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/TextEvents.h"
 
 class gfxASurface;
 

widget/cocoa/NativeKeyBindings.h

@@ -10,6 +10,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsDataHashtable.h"
 
 // 8477f934-febf-4c79-b7fe-bb7f9ebb9b4f

widget/cocoa/NativeKeyBindings.mm

@@ -7,8 +7,8 @@
 
 #include "nsTArray.h"
 #include "nsCocoaUtils.h"
-#include "nsGUIEvent.h"
 #include "prlog.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;

widget/cocoa/TextInputHandler.mm

@@ -14,6 +14,7 @@
 #include "prlog.h"
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsChildView.h"
 #include "nsObjCExceptions.h"

widget/cocoa/nsChildView.mm

@@ -17,6 +17,7 @@
 #include "nsCocoaWindow.h"
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 
 #include "nsObjCExceptions.h"

widget/cocoa/nsCocoaUtils.mm

@@ -18,6 +18,7 @@
 #include "nsToolkit.h"
 #include "nsGUIEvent.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;

widget/cocoa/nsMenuItemX.mm

@@ -21,6 +21,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
+#include "nsIDOMEvent.h"
 
 nsMenuItemX::nsMenuItemX()
 {

widget/gonk/nsAppShell.cpp

@@ -39,6 +39,7 @@
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/Services.h"
+#include "mozilla/TextEvents.h"
 #include "nsAppShell.h"
 #include "mozilla/dom/Touch.h"
 #include "nsGkAtoms.h"

widget/gtk/nsGtkIMModule.cpp

@@ -12,8 +12,9 @@
 
 #include "nsGtkIMModule.h"
 #include "nsWindow.h"
-#include "mozilla/Preferences.h"
 #include "mozilla/Likely.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;

widget/gtk/nsGtkIMModule.h

@@ -14,8 +14,8 @@
 #include "nsString.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
-#include "nsGUIEvent.h"
 #include "nsIWidget.h"
+#include "mozilla/EventForwards.h"
 
 class nsWindow;
 

widget/gtk/nsGtkKeyUtils.cpp

@@ -28,6 +28,7 @@ PRLogModuleInfo* gKeymapWrapperLog = nullptr;
 #endif // PR_LOGGING
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 
 namespace mozilla {

widget/gtk/nsNativeKeyBindings.cpp

@@ -4,13 +4,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 
 #include "nsNativeKeyBindings.h"
 #include "nsString.h"
 #include "nsMemory.h"
 #include "nsGtkKeyUtils.h"
-#include "nsGUIEvent.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>

widget/gtk/nsNativeKeyBindings.h

@@ -13,6 +13,7 @@
 
 #include "nsINativeKeyBindings.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include <gtk/gtk.h>
 
 enum NativeKeyBindingsType {

widget/gtk/nsWindow.cpp

@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 #include <algorithm>
 

widget/nsGUIEvent.h

@@ -9,6 +9,5 @@
 #include "mozilla/BasicEvents.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/MiscEvents.h"
-#include "mozilla/TextEvents.h"
 
 #endif // nsGUIEvent_h__

widget/nsGUIEventIPC.h

@@ -10,6 +10,7 @@
 #include "mozilla/GfxMessageUtils.h"
 #include "mozilla/dom/Touch.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "nsGUIEvent.h"
 

widget/os2/nsWindow.cpp

@@ -46,6 +46,7 @@
 #include "nsIDOMWheelEvent.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 #include <os2im.h>
 #include <algorithm>    // std::max
 using namespace mozilla;

widget/qt/mozqwidget.cpp

@@ -17,6 +17,7 @@
 
 #include "nsIObserverService.h"
 #include "mozilla/Services.h"
+#include "mozilla/TextEvents.h"
 
 
 #ifdef MOZ_ENABLE_QTMOBILITY

widget/qt/nsQtKeyUtils.cpp

@@ -4,13 +4,12 @@
  * 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/. */
 
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 
 #include "nsWindow.h"
 #include "nsQtKeyUtils.h"
 
-#include "nsGUIEvent.h"
-
 using namespace mozilla;
 using namespace mozilla::widget;
 

widget/qt/nsWindow.cpp

@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 #include "mozilla/Util.h"
 

widget/shared/WidgetUtils.cpp

@@ -6,7 +6,7 @@
 
 #include "WidgetUtils.h"
 
-#include "nsGUIEvent.h"
+#include "mozilla/TextEvents.h"
 
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeItem.h"

widget/windows/KeyboardLayout.cpp

@@ -5,6 +5,7 @@
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 
 #include "KeyboardLayout.h"

widget/windows/nsIMM32Handler.cpp

@@ -16,6 +16,8 @@
 #include "KeyboardLayout.h"
 #include <algorithm>
 
+#include "mozilla/TextEvents.h"
+
 using namespace mozilla::widget;
 
 static nsIMM32Handler* gIMM32Handler = nullptr;

widget/windows/nsIMM32Handler.h

@@ -9,8 +9,8 @@
 #include "nscore.h"
 #include <windows.h>
 #include "nsString.h"
-#include "nsGUIEvent.h"
 #include "nsTArray.h"
+#include "mozilla/EventForwards.h"
 
 class nsIWidget;
 class nsWindow;

widget/windows/nsTextStore.cpp

@@ -19,6 +19,7 @@
 #include "nsPrintfCString.h"
 #include "WinUtils.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/TextEvents.h"
 
 #define INPUTSCOPE_INIT_GUID
 #include "nsTextStore.h"

widget/windows/nsTextStore.h

@@ -13,6 +13,7 @@
 #include "nsIWidget.h"
 #include "nsWindowBase.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TextEvents.h"
 
 #include <msctf.h>
 #include <textstor.h>

widget/windows/winrt/MetroWidget.cpp

@@ -32,6 +32,7 @@
 #include "UIABridgePrivate.h"
 #include "WinMouseScrollHandler.h"
 #include "InputData.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/TouchEvents.h"
 
 using namespace Microsoft::WRL;

widget/xpwidgets/PuppetWidget.cpp

@@ -16,6 +16,7 @@
 #include "mozilla/Hal.h"
 #include "mozilla/layers/CompositorChild.h"
 #include "mozilla/layers/PLayerTransactionChild.h"
+#include "mozilla/TextEvents.h"
 #include "PuppetWidget.h"
 #include "nsIWidgetListener.h"