From 743fbc6e593a5d611257af3ba6a27a0bea11e52c Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Wed, 25 Sep 2013 20:21:16 +0900 Subject: [PATCH] Bug 912956 part.13 mozilla/TouchEvents.h should be included directly r=roc --- accessible/src/base/nsCoreUtils.cpp | 1 + content/events/src/nsDOMEvent.cpp | 1 + content/events/src/nsDOMSimpleGestureEvent.cpp | 1 + content/events/src/nsDOMSimpleGestureEvent.h | 1 + content/events/src/nsDOMTouchEvent.cpp | 2 +- content/events/src/nsDOMTouchEvent.h | 2 ++ content/events/src/nsEventDispatcher.cpp | 1 + content/events/src/nsEventStateManager.cpp | 1 + content/events/src/nsEventStateManager.h | 1 + content/html/content/src/HTMLInputElement.cpp | 1 + dom/base/nsDOMWindowUtils.cpp | 2 ++ dom/ipc/TabChild.cpp | 1 + dom/ipc/TabChild.h | 1 + dom/ipc/TabParent.cpp | 1 + dom/ipc/TabParent.h | 1 + gfx/layers/composite/APZCTreeManager.cpp | 1 + gfx/layers/ipc/AsyncPanZoomController.cpp | 2 +- layout/base/nsPresShell.cpp | 1 + layout/forms/nsRangeFrame.cpp | 2 ++ layout/xul/base/src/nsBoxFrame.cpp | 2 ++ widget/android/AndroidJavaWrappers.cpp | 1 + widget/android/AndroidJavaWrappers.h | 1 + widget/android/nsWindow.cpp | 2 ++ widget/cocoa/nsChildView.mm | 2 ++ widget/gonk/nsAppShell.cpp | 1 + widget/nsGUIEvent.h | 1 - widget/nsGUIEventIPC.h | 1 + widget/qt/nsWindow.cpp | 1 + widget/windows/nsWinGesture.cpp | 1 + widget/windows/nsWinGesture.h | 2 +- widget/windows/nsWindow.cpp | 1 + widget/windows/winrt/MetroInput.cpp | 1 + widget/windows/winrt/MetroWidget.cpp | 1 + widget/xpwidgets/InputData.cpp | 1 + 34 files changed, 39 insertions(+), 4 deletions(-) diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp index e1b212455e66..0bb6fdb65b32 100644 --- a/accessible/src/base/nsCoreUtils.cpp +++ b/accessible/src/base/nsCoreUtils.cpp @@ -25,6 +25,7 @@ #include "nsISelectionPrivate.h" #include "nsISelectionController.h" #include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" #include "nsView.h" #include "nsGkAtoms.h" #include "nsDOMTouchEvent.h" diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 579b86df1b92..3750b5ea52ee 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -15,6 +15,7 @@ #include "nsIPresShell.h" #include "nsIDocument.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" #include "nsContentUtils.h" #include "nsJSEnvironment.h" #include "mozilla/Preferences.h" diff --git a/content/events/src/nsDOMSimpleGestureEvent.cpp b/content/events/src/nsDOMSimpleGestureEvent.cpp index 0ea68bbbe8f2..1661b5c6a133 100644 --- a/content/events/src/nsDOMSimpleGestureEvent.cpp +++ b/content/events/src/nsDOMSimpleGestureEvent.cpp @@ -5,6 +5,7 @@ #include "nsDOMSimpleGestureEvent.h" #include "prtime.h" +#include "mozilla/TouchEvents.h" nsDOMSimpleGestureEvent::nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwner, nsPresContext* aPresContext, diff --git a/content/events/src/nsDOMSimpleGestureEvent.h b/content/events/src/nsDOMSimpleGestureEvent.h index aaeeec058458..a91cb0def69f 100644 --- a/content/events/src/nsDOMSimpleGestureEvent.h +++ b/content/events/src/nsDOMSimpleGestureEvent.h @@ -7,6 +7,7 @@ #include "nsIDOMSimpleGestureEvent.h" #include "nsDOMMouseEvent.h" +#include "mozilla/TouchEvents.h" #include "mozilla/dom/SimpleGestureEventBinding.h" class nsPresContext; diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp index 683d559cbb74..16ce1303467e 100644 --- a/content/events/src/nsDOMTouchEvent.cpp +++ b/content/events/src/nsDOMTouchEvent.cpp @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsDOMTouchEvent.h" -#include "nsGUIEvent.h" #include "nsContentUtils.h" #include "mozilla/Preferences.h" #include "mozilla/dom/Touch.h" #include "mozilla/dom/TouchListBinding.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h index 07a3b656fc75..8f3ccceb688b 100644 --- a/content/events/src/nsDOMTouchEvent.h +++ b/content/events/src/nsDOMTouchEvent.h @@ -8,10 +8,12 @@ #include "nsDOMUIEvent.h" #include "nsTArray.h" #include "mozilla/Attributes.h" +#include "mozilla/TouchEvents.h" #include "nsJSEnvironment.h" #include "mozilla/dom/TouchEventBinding.h" #include "nsWrapperCache.h" + class nsAString; class nsDOMTouchList MOZ_FINAL : public nsISupports diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp index f71086f548ea..edafeb15b1fe 100644 --- a/content/events/src/nsEventDispatcher.cpp +++ b/content/events/src/nsEventDispatcher.cpp @@ -18,6 +18,7 @@ #include "GeneratedEvents.h" #include "mozilla/dom/EventTarget.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 3be00fdb0c11..11256de7ae14 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -6,6 +6,7 @@ #include "mozilla/Attributes.h" #include "mozilla/MathAlgorithms.h" +#include "mozilla/TouchEvents.h" #include "mozilla/dom/TabParent.h" #include "nsCOMPtr.h" diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index 5a7315591fda..6fcd6af54e5d 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -6,6 +6,7 @@ #ifndef nsEventStateManager_h__ #define nsEventStateManager_h__ +#include "mozilla/EventForwards.h" #include "mozilla/TypedEnum.h" #include "nsGUIEvent.h" diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp index 583fdfc9a0fe..7f0e188e75ab 100644 --- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -59,6 +59,7 @@ #include "nsIDOMMutationEvent.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" #include "nsEventListenerManager.h" #include "nsRuleData.h" diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index fba25cc7364c..263103da2165 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -34,6 +34,8 @@ #include "nsJSEnvironment.h" #include "nsJSUtils.h" +#include "mozilla/TouchEvents.h" + #include "nsViewManager.h" #include "nsIDOMHTMLCanvasElement.h" diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 23275f2ac86a..562c531bc581 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -24,6 +24,7 @@ #include "mozilla/layers/ShadowLayers.h" #include "mozilla/layout/RenderFrameChild.h" #include "mozilla/StaticPtr.h" +#include "mozilla/TouchEvents.h" #include "mozilla/unused.h" #include "mozIApplication.h" #include "nsContentUtils.h" diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h index d6b9097dae30..62ebdffb318b 100644 --- a/dom/ipc/TabChild.h +++ b/dom/ipc/TabChild.h @@ -35,6 +35,7 @@ #include "nsITabChild.h" #include "mozilla/Attributes.h" #include "mozilla/dom/TabContext.h" +#include "mozilla/EventForwards.h" struct gfxMatrix; class nsICachedFileDescriptorListener; diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index f18159d966a1..bff528ee4c51 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -19,6 +19,7 @@ #include "mozilla/layers/CompositorParent.h" #include "mozilla/layout/RenderFrameParent.h" #include "mozilla/Preferences.h" +#include "mozilla/TouchEvents.h" #include "mozilla/unused.h" #include "nsCOMPtr.h" #include "nsContentPermissionHelper.h" diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h index 4e323649f446..5c6175b76321 100644 --- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -10,6 +10,7 @@ #include "mozilla/dom/PBrowserParent.h" #include "mozilla/dom/PContentDialogParent.h" #include "mozilla/dom/TabContext.h" +#include "mozilla/TouchEvents.h" #include "nsCOMPtr.h" #include "nsIAuthPromptProvider.h" #include "nsIBrowserDOMWindow.h" diff --git a/gfx/layers/composite/APZCTreeManager.cpp b/gfx/layers/composite/APZCTreeManager.cpp index 794cec4b0348..17c943a73af4 100644 --- a/gfx/layers/composite/APZCTreeManager.cpp +++ b/gfx/layers/composite/APZCTreeManager.cpp @@ -14,6 +14,7 @@ #include "mozilla/gfx/Point.h" // for Point #include "mozilla/layers/AsyncPanZoomController.h" #include "mozilla/mozalloc.h" // for operator new +#include "mozilla/TouchEvents.h" #include "nsGUIEvent.h" // for nsMouseEvent, nsTouchEvent, etc #include "nsPoint.h" // for nsIntPoint #include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp index e489259a97d0..9742bf9d37b8 100644 --- a/gfx/layers/ipc/AsyncPanZoomController.cpp +++ b/gfx/layers/ipc/AsyncPanZoomController.cpp @@ -21,6 +21,7 @@ #include "gfxTypes.h" // for gfxFloat #include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/ClearOnShutdown.h" // for ClearOnShutdown +#include "mozilla/EventForwards.h" // for nsEventStatus_* #include "mozilla/Preferences.h" // for Preferences #include "mozilla/ReentrantMonitor.h" // for ReentrantMonitorAutoEnter, etc #include "mozilla/StaticPtr.h" // for StaticAutoPtr @@ -41,7 +42,6 @@ #include "nsAutoPtr.h" // for nsRefPtr #include "nsCOMPtr.h" // for already_AddRefed #include "nsDebug.h" // for NS_WARNING -#include "nsGUIEvent.h" // for nsInputEvent, nsTouchEvent, etc #include "nsISupportsImpl.h" #include "nsMathUtils.h" // for NS_hypot #include "nsPoint.h" // for nsIntPoint diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index f9518562f2c4..6eb2f618066d 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -21,6 +21,7 @@ #include "mozilla/MemoryReporting.h" #include "mozilla/dom/TabChild.h" #include "mozilla/Likely.h" +#include "mozilla/TouchEvents.h" #include "mozilla/Util.h" #include diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp index 13ae14f18a14..a8adb9627474 100644 --- a/layout/forms/nsRangeFrame.cpp +++ b/layout/forms/nsRangeFrame.cpp @@ -5,6 +5,8 @@ #include "nsRangeFrame.h" +#include "mozilla/TouchEvents.h" + #include "nsContentCreatorFunctions.h" #include "nsContentList.h" #include "nsContentUtils.h" diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp index c6b1310c455f..876fdb823250 100644 --- a/layout/xul/base/src/nsBoxFrame.cpp +++ b/layout/xul/base/src/nsBoxFrame.cpp @@ -67,6 +67,8 @@ // Needed for Print Preview #include "nsIURI.h" +#include "mozilla/TouchEvents.h" + using namespace mozilla; using namespace mozilla::dom; diff --git a/widget/android/AndroidJavaWrappers.cpp b/widget/android/AndroidJavaWrappers.cpp index 21f4d5d1dc29..dce5a3984699 100644 --- a/widget/android/AndroidJavaWrappers.cpp +++ b/widget/android/AndroidJavaWrappers.cpp @@ -10,6 +10,7 @@ #include "nsIDOMKeyEvent.h" #include "nsIWidget.h" #include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::dom; diff --git a/widget/android/AndroidJavaWrappers.h b/widget/android/AndroidJavaWrappers.h index bc9cfab4d457..0efb5d18c27f 100644 --- a/widget/android/AndroidJavaWrappers.h +++ b/widget/android/AndroidJavaWrappers.h @@ -17,6 +17,7 @@ #include "nsIObserver.h" #include "mozilla/gfx/Rect.h" #include "mozilla/dom/Touch.h" +#include "mozilla/EventForwards.h" #include "InputData.h" #include "Units.h" diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index d52c8471450e..cada9ac8ffc3 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -7,6 +7,8 @@ #include #include +#include "mozilla/TouchEvents.h" + #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/unused.h" diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index b450f1cb1628..85de760f53a8 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -16,6 +16,8 @@ #include "nsChildView.h" #include "nsCocoaWindow.h" +#include "mozilla/TouchEvents.h" + #include "nsObjCExceptions.h" #include "nsCOMPtr.h" #include "nsToolkit.h" diff --git a/widget/gonk/nsAppShell.cpp b/widget/gonk/nsAppShell.cpp index d44e3274bc92..f77c46c79dd3 100644 --- a/widget/gonk/nsAppShell.cpp +++ b/widget/gonk/nsAppShell.cpp @@ -33,6 +33,7 @@ #ifdef MOZ_OMX_DECODER #include "MediaResourceManagerService.h" #endif +#include "mozilla/TouchEvents.h" #include "mozilla/FileUtils.h" #include "mozilla/Hal.h" #include "mozilla/Mutex.h" diff --git a/widget/nsGUIEvent.h b/widget/nsGUIEvent.h index bbf1d3a99141..fa8444aab8e1 100644 --- a/widget/nsGUIEvent.h +++ b/widget/nsGUIEvent.h @@ -11,6 +11,5 @@ #include "mozilla/MiscEvents.h" #include "mozilla/MouseEvents.h" #include "mozilla/TextEvents.h" -#include "mozilla/TouchEvents.h" #endif // nsGUIEvent_h__ diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h index 0e7dadeb7fc6..617e5c0d652e 100644 --- a/widget/nsGUIEventIPC.h +++ b/widget/nsGUIEventIPC.h @@ -9,6 +9,7 @@ #include "ipc/IPCMessageUtils.h" #include "mozilla/GfxMessageUtils.h" #include "mozilla/dom/Touch.h" +#include "mozilla/TouchEvents.h" #include "nsGUIEvent.h" namespace IPC diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp index eb133d0cbdb4..b2c8be19f42b 100644 --- a/widget/qt/nsWindow.cpp +++ b/widget/qt/nsWindow.cpp @@ -5,6 +5,7 @@ * 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/TouchEvents.h" #include "mozilla/Util.h" #include diff --git a/widget/windows/nsWinGesture.cpp b/widget/windows/nsWinGesture.cpp index 7bace62a98c5..e3385327ab28 100644 --- a/widget/windows/nsWinGesture.cpp +++ b/widget/windows/nsWinGesture.cpp @@ -15,6 +15,7 @@ #include "nsIDOMWheelEvent.h" #include "mozilla/Constants.h" #include "mozilla/Preferences.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::widget; diff --git a/widget/windows/nsWinGesture.h b/widget/windows/nsWinGesture.h index 420fa527058b..8992db83c487 100644 --- a/widget/windows/nsWinGesture.h +++ b/widget/windows/nsWinGesture.h @@ -14,7 +14,7 @@ #include #include #include "nsPoint.h" -#include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" // Desktop builds target apis for 502. Win8 Metro builds target 602. #if WINVER < 0x0602 diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 190ba5fb31b1..455008b5e130 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -55,6 +55,7 @@ **************************************************************/ #include "mozilla/MathAlgorithms.h" +#include "mozilla/TouchEvents.h" #include "mozilla/Util.h" #include "mozilla/ipc/RPCChannel.h" diff --git a/widget/windows/winrt/MetroInput.cpp b/widget/windows/winrt/MetroInput.cpp index e39fae7cdae8..890351f489d8 100644 --- a/widget/windows/winrt/MetroInput.cpp +++ b/widget/windows/winrt/MetroInput.cpp @@ -13,6 +13,7 @@ #include "InputData.h" #include "UIABridgePrivate.h" #include "MetroAppShell.h" +#include "mozilla/TouchEvents.h" // System headers (alphabetical) #include // ABI::Window::UI::Core namespace diff --git a/widget/windows/winrt/MetroWidget.cpp b/widget/windows/winrt/MetroWidget.cpp index 1caccae0701e..ab0d3fc871bd 100644 --- a/widget/windows/winrt/MetroWidget.cpp +++ b/widget/windows/winrt/MetroWidget.cpp @@ -32,6 +32,7 @@ #include "UIABridgePrivate.h" #include "WinMouseScrollHandler.h" #include "InputData.h" +#include "mozilla/TouchEvents.h" using namespace Microsoft::WRL; using namespace Microsoft::WRL::Wrappers; diff --git a/widget/xpwidgets/InputData.cpp b/widget/xpwidgets/InputData.cpp index dce2a37d1594..fdf7a71ca451 100644 --- a/widget/xpwidgets/InputData.cpp +++ b/widget/xpwidgets/InputData.cpp @@ -9,6 +9,7 @@ #include "mozilla/dom/Touch.h" #include "nsDebug.h" #include "nsThreadUtils.h" +#include "mozilla/TouchEvents.h" namespace mozilla {