Bug 1259666 part 1 - rename variable and definition change - r?masayuki
MozReview-Commit-ID: 1FWJypkoqYz
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2698,17 +2698,17 @@ EventStateManager::DecideGestureEvent(Wi
*
* *willing: determine if it makes sense to pan the element using scroll events:
* - For web content: if there are any visible scrollbars on the touch point
* - For XUL: if it's an scrollable element that can currently scroll in some
* direction.
*
* Note: we'll have to one-off various cases to ensure a good usable behavior
*/
- WidgetGestureNotifyEvent::ePanDirection panDirection =
+ WidgetGestureNotifyEvent::PanDirection panDirection =
WidgetGestureNotifyEvent::ePanNone;
bool displayPanFeedback = false;
for (nsIFrame* current = targetFrame; current;
current = nsLayoutUtils::GetCrossDocParentFrame(current)) {
// e10s - mark remote content as pannable. This is a work around since
// we don't have access to remote frame scroll info here. Apz data may
// assist is solving this.
--- a/widget/TouchEvents.h
+++ b/widget/TouchEvents.h
@@ -56,25 +56,26 @@ public:
// Not copying widget, it is a weak reference.
WidgetGestureNotifyEvent* result =
new WidgetGestureNotifyEvent(false, mMessage, nullptr);
result->AssignGestureNotifyEventData(*this, true);
result->mFlags = mFlags;
return result;
}
- enum ePanDirection
+ typedef int8_t PanDirectionType;
+ enum PanDirection : PanDirectionType
{
ePanNone,
ePanVertical,
ePanHorizontal,
ePanBoth
};
- ePanDirection panDirection;
+ PanDirection panDirection;
bool displayPanFeedback;
void AssignGestureNotifyEventData(const WidgetGestureNotifyEvent& aEvent,
bool aCopyTargets)
{
AssignGUIEventData(aEvent, aCopyTargets);
panDirection = aEvent.panDirection;
--- a/widget/windows/nsWinGesture.cpp
+++ b/widget/windows/nsWinGesture.cpp
@@ -114,17 +114,17 @@ bool nsWinGesture::InitLibrary()
Preferences::GetBool("gestures.enable_single_finger_input", false);
return true;
}
#define GCOUNT 5
bool nsWinGesture::SetWinGestureSupport(HWND hWnd,
- WidgetGestureNotifyEvent::ePanDirection aDirection)
+ WidgetGestureNotifyEvent::PanDirection aDirection)
{
if (!getGestureInfo)
return false;
GESTURECONFIG config[GCOUNT];
memset(&config, 0, sizeof(config));
--- a/widget/windows/nsWinGesture.h
+++ b/widget/windows/nsWinGesture.h
@@ -193,17 +193,17 @@ public:
};
class nsWinGesture
{
public:
nsWinGesture();
public:
- bool SetWinGestureSupport(HWND hWnd, mozilla::WidgetGestureNotifyEvent::ePanDirection aDirection);
+ bool SetWinGestureSupport(HWND hWnd, mozilla::WidgetGestureNotifyEvent::PanDirection aDirection);
bool ShutdownWinGestureSupport();
bool RegisterTouchWindow(HWND hWnd);
bool UnregisterTouchWindow(HWND hWnd);
bool GetTouchInputInfo(HTOUCHINPUT hTouchInput, uint32_t cInputs, PTOUCHINPUT pInputs);
bool CloseTouchInputHandle(HTOUCHINPUT hTouchInput);
bool IsAvailable();
// Simple gesture process