author | Masayuki Nakano <masayuki@d-toybox.com> |
Wed, 25 Sep 2013 20:21:16 +0900 | |
changeset 148649 | de77a9248c0481cb809adee38962c21342b73c3c |
parent 148648 | 10205aaf44cddfe8811e481057e10b14c2d0e326 |
child 148650 | d3d5df94a2fc526223e1585b9726a61f7eb99dbf |
push id | 25349 |
push user | ryanvm@gmail.com |
push date | Wed, 25 Sep 2013 18:52:12 +0000 |
treeherder | mozilla-central@39f30376058c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | roc |
bugs | 912956 |
milestone | 27.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/accessible/src/base/nsCoreUtils.cpp +++ b/accessible/src/base/nsCoreUtils.cpp @@ -20,16 +20,17 @@ #include "nsEventListenerManager.h" #include "nsIPresShell.h" #include "nsPresContext.h" #include "nsIScrollableFrame.h" #include "nsEventStateManager.h" #include "nsISelectionPrivate.h" #include "nsISelectionController.h" #include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" #include "nsView.h" #include "nsGkAtoms.h" #include "nsDOMTouchEvent.h" #include "nsComponentManagerUtils.h" #include "nsITreeBoxObject.h" #include "nsITreeColumns.h"
--- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -10,16 +10,17 @@ #include "nsError.h" #include "nsDOMEvent.h" #include "nsEventStateManager.h" #include "nsIFrame.h" #include "nsIContent.h" #include "nsIPresShell.h" #include "nsIDocument.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" #include "nsContentUtils.h" #include "nsJSEnvironment.h" #include "mozilla/Preferences.h" #include "nsLayoutUtils.h" #include "nsIScrollableFrame.h" #include "nsDOMEventTargetHelper.h" #include "nsPIWindowRoot.h" #include "nsGlobalWindow.h"
--- a/content/events/src/nsDOMSimpleGestureEvent.cpp +++ b/content/events/src/nsDOMSimpleGestureEvent.cpp @@ -1,15 +1,16 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 "nsDOMSimpleGestureEvent.h" #include "prtime.h" +#include "mozilla/TouchEvents.h" nsDOMSimpleGestureEvent::nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwner, nsPresContext* aPresContext, nsSimpleGestureEvent* aEvent) : nsDOMMouseEvent(aOwner, aPresContext, aEvent ? aEvent : new nsSimpleGestureEvent(false, 0, nullptr, 0, 0.0)) { NS_ASSERTION(mEvent->eventStructType == NS_SIMPLE_GESTURE_EVENT, "event type mismatch");
--- a/content/events/src/nsDOMSimpleGestureEvent.h +++ b/content/events/src/nsDOMSimpleGestureEvent.h @@ -2,16 +2,17 @@ * 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 nsDOMSimpleGestureEvent_h__ #define nsDOMSimpleGestureEvent_h__ #include "nsIDOMSimpleGestureEvent.h" #include "nsDOMMouseEvent.h" +#include "mozilla/TouchEvents.h" #include "mozilla/dom/SimpleGestureEventBinding.h" class nsPresContext; class nsDOMSimpleGestureEvent : public nsDOMMouseEvent, public nsIDOMSimpleGestureEvent { public:
--- a/content/events/src/nsDOMTouchEvent.cpp +++ b/content/events/src/nsDOMTouchEvent.cpp @@ -1,20 +1,20 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 "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; // TouchList NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMTouchList) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
--- a/content/events/src/nsDOMTouchEvent.h +++ b/content/events/src/nsDOMTouchEvent.h @@ -3,20 +3,22 @@ * 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 nsDOMTouchEvent_h_ #define nsDOMTouchEvent_h_ #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 , public nsWrapperCache { typedef mozilla::dom::Touch Touch; public:
--- a/content/events/src/nsEventDispatcher.cpp +++ b/content/events/src/nsEventDispatcher.cpp @@ -13,16 +13,17 @@ #include <new> #include "nsINode.h" #include "nsPIDOMWindow.h" #include "nsDOMTouchEvent.h" #include "GeckoProfiler.h" #include "GeneratedEvents.h" #include "mozilla/dom/EventTarget.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::dom; class ELMCreationDetector { public: ELMCreationDetector() :
--- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -1,16 +1,17 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* vim: set ts=2 sw=2 et tw=80: */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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/Attributes.h" #include "mozilla/MathAlgorithms.h" +#include "mozilla/TouchEvents.h" #include "mozilla/dom/TabParent.h" #include "nsCOMPtr.h" #include "nsEventStateManager.h" #include "nsIMEStateManager.h" #include "nsContentEventHandler.h" #include "nsIContent.h" #include "nsINodeInfo.h"
--- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -1,16 +1,17 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 nsEventStateManager_h__ #define nsEventStateManager_h__ +#include "mozilla/EventForwards.h" #include "mozilla/TypedEnum.h" #include "nsGUIEvent.h" #include "nsIObserver.h" #include "nsWeakReference.h" #include "nsCOMPtr.h" #include "nsCOMArray.h" #include "nsCycleCollectionParticipant.h"
--- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -54,16 +54,17 @@ #include "nsLinebreakConverter.h" //to strip out carriage returns #include "nsReadableUtils.h" #include "nsUnicharUtils.h" #include "nsEventDispatcher.h" #include "nsLayoutUtils.h" #include "nsIDOMMutationEvent.h" #include "mozilla/MutationEvent.h" +#include "mozilla/TouchEvents.h" #include "nsEventListenerManager.h" #include "nsRuleData.h" #include <algorithm> // input type=radio #include "nsIRadioGroupContainer.h"
--- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -29,16 +29,18 @@ #include "nsIFrame.h" #include "nsIWidget.h" #include "nsGUIEvent.h" #include "nsCharsetSource.h" #include "nsJSEnvironment.h" #include "nsJSUtils.h" +#include "mozilla/TouchEvents.h" + #include "nsViewManager.h" #include "nsIDOMHTMLCanvasElement.h" #include "gfxImageSurface.h" #include "nsLayoutUtils.h" #include "nsComputedDOMStyle.h" #include "nsIPresShell.h" #include "nsStyleAnimation.h"
--- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -19,16 +19,17 @@ #include "mozilla/ipc/DocumentRendererChild.h" #include "mozilla/ipc/FileDescriptorUtils.h" #include "mozilla/layers/AsyncPanZoomController.h" #include "mozilla/layers/CompositorChild.h" #include "mozilla/layers/ImageBridgeChild.h" #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" #include "nsCxPusher.h" #include "nsEmbedCID.h" #include "nsEventListenerManager.h" #include <algorithm> #ifdef MOZ_CRASHREPORTER
--- a/dom/ipc/TabChild.h +++ b/dom/ipc/TabChild.h @@ -30,16 +30,17 @@ #include "nsDOMEventTargetHelper.h" #include "nsIDialogCreator.h" #include "nsIPresShell.h" #include "nsIScriptObjectPrincipal.h" #include "nsWeakReference.h" #include "nsITabChild.h" #include "mozilla/Attributes.h" #include "mozilla/dom/TabContext.h" +#include "mozilla/EventForwards.h" struct gfxMatrix; class nsICachedFileDescriptorListener; class nsIDOMWindowUtils; namespace mozilla { namespace layout { class RenderFrameChild;
--- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -14,16 +14,17 @@ #include "mozilla/BrowserElementParent.h" #include "mozilla/docshell/OfflineCacheUpdateParent.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/Hal.h" #include "mozilla/ipc/DocumentRendererParent.h" #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" #include "nsContentUtils.h" #include "nsDebug.h" #include "nsEventStateManager.h" #include "nsFocusManager.h" #include "nsFrameLoader.h"
--- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -5,16 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef mozilla_tabs_TabParent_h #define mozilla_tabs_TabParent_h #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" #include "nsIDialogParamBlock.h" #include "nsISecureBrowserUI.h" #include "nsITabParent.h" #include "Units.h" #include "js/TypeDecls.h"
--- a/gfx/layers/composite/APZCTreeManager.cpp +++ b/gfx/layers/composite/APZCTreeManager.cpp @@ -9,16 +9,17 @@ #include "CompositorParent.h" // for CompositorParent, etc #include "InputData.h" // for InputData, etc #include "Layers.h" // for ContainerLayer, Layer, etc #include "gfx3DMatrix.h" // for gfx3DMatrix #include "mozilla/dom/Touch.h" // for Touch #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 #include "nsThreadUtils.h" // for NS_IsMainThread #define APZC_LOG(...) // #define APZC_LOG(args...) printf_stderr(args)
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp +++ b/gfx/layers/ipc/AsyncPanZoomController.cpp @@ -16,16 +16,17 @@ #include "InputData.h" // for MultiTouchInput, etc #include "Units.h" // for CSSRect, CSSPoint, etc #include "base/message_loop.h" // for MessageLoop #include "base/task.h" // for NewRunnableMethod, etc #include "base/tracked.h" // for FROM_HERE #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 #include "mozilla/TimeStamp.h" // for TimeDuration, TimeStamp #include "mozilla/dom/Touch.h" // for Touch #include "mozilla/gfx/BasePoint.h" // for BasePoint #include "mozilla/gfx/BaseRect.h" // for BaseRect #include "mozilla/gfx/Point.h" // for Point, RoundedToInt, etc @@ -36,17 +37,16 @@ #include "mozilla/layers/Axis.h" // for AxisX, AxisY, Axis, etc #include "mozilla/layers/GeckoContentController.h" #include "mozilla/layers/TaskThrottler.h" // for TaskThrottler #include "mozilla/mozalloc.h" // for operator new, etc #include "nsAlgorithm.h" // for clamped #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 #include "nsStyleConsts.h" #include "nsStyleStruct.h" // for nsTimingFunction #include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc #include "nsThreadUtils.h" // for NS_IsMainThread #include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
--- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -16,16 +16,17 @@ * 05/03/2000 IBM Corp. Observer events for reflow states */ /* a presentation of a document, part 2 */ #include "mozilla/MemoryReporting.h" #include "mozilla/dom/TabChild.h" #include "mozilla/Likely.h" +#include "mozilla/TouchEvents.h" #include "mozilla/Util.h" #include <algorithm> #ifdef XP_WIN #include "winuser.h" #endif #include "nsPresShell.h"
--- a/layout/forms/nsRangeFrame.cpp +++ b/layout/forms/nsRangeFrame.cpp @@ -1,15 +1,17 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 "nsRangeFrame.h" +#include "mozilla/TouchEvents.h" + #include "nsContentCreatorFunctions.h" #include "nsContentList.h" #include "nsContentUtils.h" #include "nsCSSRenderingBorders.h" #include "nsFormControlFrame.h" #include "nsIContent.h" #include "nsIDocument.h" #include "nsINameSpaceManager.h"
--- a/layout/xul/base/src/nsBoxFrame.cpp +++ b/layout/xul/base/src/nsBoxFrame.cpp @@ -62,16 +62,18 @@ #include "nsDisplayList.h" #include "mozilla/Preferences.h" #include "nsThemeConstants.h" #include <algorithm> // Needed for Print Preview #include "nsIURI.h" +#include "mozilla/TouchEvents.h" + using namespace mozilla; using namespace mozilla::dom; //define DEBUG_REDRAW #define DEBUG_SPRING_SIZE 8 #define DEBUG_BORDER_SIZE 2 #define COIL_SIZE 8
--- a/widget/android/AndroidJavaWrappers.cpp +++ b/widget/android/AndroidJavaWrappers.cpp @@ -5,16 +5,17 @@ #include "AndroidJavaWrappers.h" #include "AndroidBridge.h" #include "AndroidBridgeUtilities.h" #include "nsIAndroidBridge.h" #include "nsIDOMKeyEvent.h" #include "nsIWidget.h" #include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::dom; jclass AndroidGeckoEvent::jGeckoEventClass = 0; jfieldID AndroidGeckoEvent::jActionField = 0; jfieldID AndroidGeckoEvent::jTypeField = 0; jfieldID AndroidGeckoEvent::jAckNeededField = 0;
--- a/widget/android/AndroidJavaWrappers.h +++ b/widget/android/AndroidJavaWrappers.h @@ -12,16 +12,17 @@ #include "nsGeoPosition.h" #include "nsRect.h" #include "nsString.h" #include "nsTArray.h" #include "nsIObserver.h" #include "mozilla/gfx/Rect.h" #include "mozilla/dom/Touch.h" +#include "mozilla/EventForwards.h" #include "InputData.h" #include "Units.h" //#define FORCE_ALOG 1 #ifndef ALOG #if defined(DEBUG) || defined(FORCE_ALOG) #define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args)
--- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -2,16 +2,18 @@ * This Source Code Form is subject to the terms of the Mozilla Public * 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 <android/log.h> #include <math.h> #include <unistd.h> +#include "mozilla/TouchEvents.h" + #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/unused.h" #include "mozilla/Preferences.h" #include "mozilla/layers/RenderTrace.h" #include <algorithm> using mozilla::dom::ContentParent;
--- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -11,16 +11,18 @@ #include "prlog.h" #include <unistd.h> #include <math.h> #include "nsChildView.h" #include "nsCocoaWindow.h" +#include "mozilla/TouchEvents.h" + #include "nsObjCExceptions.h" #include "nsCOMPtr.h" #include "nsToolkit.h" #include "nsCRT.h" #include "nsFontMetrics.h" #include "nsIRollupListener.h" #include "nsViewManager.h"
--- a/widget/gonk/nsAppShell.cpp +++ b/widget/gonk/nsAppShell.cpp @@ -28,16 +28,17 @@ #include <sys/types.h> #include <unistd.h> #include "base/basictypes.h" #include "nscore.h" #ifdef MOZ_OMX_DECODER #include "MediaResourceManagerService.h" #endif +#include "mozilla/TouchEvents.h" #include "mozilla/FileUtils.h" #include "mozilla/Hal.h" #include "mozilla/Mutex.h" #include "mozilla/Services.h" #include "nsAppShell.h" #include "mozilla/dom/Touch.h" #include "nsGkAtoms.h" #include "nsGUIEvent.h"
--- a/widget/nsGUIEvent.h +++ b/widget/nsGUIEvent.h @@ -6,11 +6,10 @@ #ifndef nsGUIEvent_h__ #define nsGUIEvent_h__ #include "mozilla/BasicEvents.h" #include "mozilla/ContentEvents.h" #include "mozilla/MiscEvents.h" #include "mozilla/MouseEvents.h" #include "mozilla/TextEvents.h" -#include "mozilla/TouchEvents.h" #endif // nsGUIEvent_h__
--- a/widget/nsGUIEventIPC.h +++ b/widget/nsGUIEventIPC.h @@ -4,16 +4,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef nsGUIEventIPC_h__ #define nsGUIEventIPC_h__ #include "ipc/IPCMessageUtils.h" #include "mozilla/GfxMessageUtils.h" #include "mozilla/dom/Touch.h" +#include "mozilla/TouchEvents.h" #include "nsGUIEvent.h" namespace IPC { template<> struct ParamTraits<mozilla::BaseEventFlags> {
--- a/widget/qt/nsWindow.cpp +++ b/widget/qt/nsWindow.cpp @@ -1,15 +1,16 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* vim:expandtab:shiftwidth=4:tabstop=4: */ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 <QApplication> #include <QDesktopWidget> #include <QtGui/QCursor> #include <QIcon> #include <QGraphicsScene> #include <QGraphicsView>
--- a/widget/windows/nsWinGesture.cpp +++ b/widget/windows/nsWinGesture.cpp @@ -10,16 +10,17 @@ #include "nscore.h" #include "nsWinGesture.h" #include "nsUXThemeData.h" #include "nsIDOMSimpleGestureEvent.h" #include "nsGUIEvent.h" #include "nsIDOMWheelEvent.h" #include "mozilla/Constants.h" #include "mozilla/Preferences.h" +#include "mozilla/TouchEvents.h" using namespace mozilla; using namespace mozilla::widget; #ifdef PR_LOGGING extern PRLogModuleInfo* gWindowsLog; #endif
--- a/widget/windows/nsWinGesture.h +++ b/widget/windows/nsWinGesture.h @@ -9,17 +9,17 @@ /* * nsWinGesture - Touch input handling for tablet displays. */ #include "nsdefs.h" #include <winuser.h> #include <tpcshrd.h> #include "nsPoint.h" -#include "nsGUIEvent.h" +#include "mozilla/TouchEvents.h" // Desktop builds target apis for 502. Win8 Metro builds target 602. #if WINVER < 0x0602 DECLARE_HANDLE(HGESTUREINFO); /* * Gesture flags - GESTUREINFO.dwFlags
--- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -50,16 +50,17 @@ ** BLOCK: Includes ** ** Include headers. ** ************************************************************** **************************************************************/ #include "mozilla/MathAlgorithms.h" +#include "mozilla/TouchEvents.h" #include "mozilla/Util.h" #include "mozilla/ipc/RPCChannel.h" #include <algorithm> #include "nsWindow.h" #include <shellapi.h>
--- a/widget/windows/winrt/MetroInput.cpp +++ b/widget/windows/winrt/MetroInput.cpp @@ -8,16 +8,17 @@ #include "MetroUtils.h" // Logging, POINT_CEIL_*, ActivateGenericInstance, etc #include "MetroWidget.h" // MetroInput::mWidget #include "mozilla/dom/Touch.h" // Touch #include "nsTArray.h" // Touch lists #include "nsIDOMSimpleGestureEvent.h" // Constants for gesture events #include "InputData.h" #include "UIABridgePrivate.h" #include "MetroAppShell.h" +#include "mozilla/TouchEvents.h" // System headers (alphabetical) #include <windows.ui.core.h> // ABI::Window::UI::Core namespace #include <windows.ui.input.h> // ABI::Window::UI::Input namespace //#define DEBUG_INPUT // Using declarations
--- a/widget/windows/winrt/MetroWidget.cpp +++ b/widget/windows/winrt/MetroWidget.cpp @@ -27,16 +27,17 @@ #include "FrameMetrics.h" #include "Windows.Graphics.Display.h" #ifdef MOZ_CRASHREPORTER #include "nsExceptionHandler.h" #endif #include "UIABridgePrivate.h" #include "WinMouseScrollHandler.h" #include "InputData.h" +#include "mozilla/TouchEvents.h" using namespace Microsoft::WRL; using namespace Microsoft::WRL::Wrappers; using namespace mozilla; using namespace mozilla::widget; using namespace mozilla::layers; using namespace mozilla::widget::winrt;
--- a/widget/xpwidgets/InputData.cpp +++ b/widget/xpwidgets/InputData.cpp @@ -4,16 +4,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "InputData.h" #include "nsGUIEvent.h" #include "mozilla/dom/Touch.h" #include "nsDebug.h" #include "nsThreadUtils.h" +#include "mozilla/TouchEvents.h" namespace mozilla { using namespace dom; MultiTouchInput::MultiTouchInput(const nsTouchEvent& aTouchEvent) : InputData(MULTITOUCH_INPUT, aTouchEvent.time) {