From 0eca40da0ceeb9e1d37469a7dfa29ce59969ba09 Mon Sep 17 00:00:00 2001
From: shundroid <ra24483@qb3.so-net.ne.jp>
Date: Wed, 6 Apr 2016 16:44:11 +0900
Subject: [PATCH] Bug 1259663 - Clean up WidgetMouseScrollEvent. r=masayuki

MozReview-Commit-ID: F98luwO9y1N

--HG--
extra : rebase_source : e798d10142104b99fa50763a2f4e42107d3c6976
---
 dom/events/EventStateManager.cpp |  8 ++++----
 dom/events/MouseScrollEvent.cpp  |  6 +++---
 widget/MouseEvents.h             | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index ad1bf5ffad84..1c24c34163bb 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2303,8 +2303,8 @@ EventStateManager::SendLineScrollEvent(nsIFrame* aTargetFrame,
   event.mTimeStamp = aEvent->mTimeStamp;
   event.mModifiers = aEvent->mModifiers;
   event.buttons = aEvent->buttons;
-  event.isHorizontal = (aDeltaDirection == DELTA_DIRECTION_X);
-  event.delta = aDelta;
+  event.mIsHorizontal = (aDeltaDirection == DELTA_DIRECTION_X);
+  event.mDelta = aDelta;
   event.inputSource = aEvent->inputSource;
 
   nsEventStatus status = nsEventStatus_eIgnore;
@@ -2343,8 +2343,8 @@ EventStateManager::SendPixelScrollEvent(nsIFrame* aTargetFrame,
   event.mTimeStamp = aEvent->mTimeStamp;
   event.mModifiers = aEvent->mModifiers;
   event.buttons = aEvent->buttons;
-  event.isHorizontal = (aDeltaDirection == DELTA_DIRECTION_X);
-  event.delta = aPixelDelta;
+  event.mIsHorizontal = (aDeltaDirection == DELTA_DIRECTION_X);
+  event.mDelta = aPixelDelta;
   event.inputSource = aEvent->inputSource;
 
   nsEventStatus status = nsEventStatus_eIgnore;
diff --git a/dom/events/MouseScrollEvent.cpp b/dom/events/MouseScrollEvent.cpp
index 7ca64cbda7a8..34b1c74fc221 100644
--- a/dom/events/MouseScrollEvent.cpp
+++ b/dom/events/MouseScrollEvent.cpp
@@ -29,7 +29,7 @@ MouseScrollEvent::MouseScrollEvent(EventTarget* aOwner,
       nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
   }
 
-  mDetail = mEvent->AsMouseScrollEvent()->delta;
+  mDetail = mEvent->AsMouseScrollEvent()->mDelta;
 }
 
 NS_IMPL_ADDREF_INHERITED(MouseScrollEvent, MouseEvent)
@@ -60,14 +60,14 @@ MouseScrollEvent::InitMouseScrollEvent(const nsAString& aType,
                              aScreenX, aScreenY, aClientX, aClientY,
                              aCtrlKey, aAltKey, aShiftKey, aMetaKey, aButton,
                              aRelatedTarget);
-  mEvent->AsMouseScrollEvent()->isHorizontal =
+  mEvent->AsMouseScrollEvent()->mIsHorizontal =
     (aAxis == nsIDOMMouseScrollEvent::HORIZONTAL_AXIS);
 }
 
 int32_t
 MouseScrollEvent::Axis()
 {
-  return mEvent->AsMouseScrollEvent()->isHorizontal ?
+  return mEvent->AsMouseScrollEvent()->mIsHorizontal ?
           static_cast<int32_t>(nsIDOMMouseScrollEvent::HORIZONTAL_AXIS) :
           static_cast<int32_t>(nsIDOMMouseScrollEvent::VERTICAL_AXIS);
 }
diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h
index fe949f21e85b..67978d3075c0 100644
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -383,8 +383,8 @@ class WidgetMouseScrollEvent : public WidgetMouseEventBase
 {
 private:
   WidgetMouseScrollEvent()
-    : delta(0)
-    , isHorizontal(false)
+    : mDelta(0)
+    , mIsHorizontal(false)
   {
   }
 
@@ -398,8 +398,8 @@ public:
                          nsIWidget* aWidget)
     : WidgetMouseEventBase(aIsTrusted, aMessage, aWidget,
                            eMouseScrollEventClass)
-    , delta(0)
-    , isHorizontal(false)
+    , mDelta(0)
+    , mIsHorizontal(false)
   {
   }
 
@@ -421,19 +421,19 @@ public:
   // nsIDOMUIEvent::SCROLL_PAGE_UP or nsIDOMUIEvent::SCROLL_PAGE_DOWN, the
   // value inducates one page scroll.  If the event message is
   // eLegacyMousePixelScroll, the value indicates scroll amount in pixels.
-  int32_t delta;
+  int32_t mDelta;
 
   // If this is true, it may cause to scroll horizontally.
   // Otherwise, vertically.
-  bool isHorizontal;
+  bool mIsHorizontal;
 
   void AssignMouseScrollEventData(const WidgetMouseScrollEvent& aEvent,
                                   bool aCopyTargets)
   {
     AssignMouseEventBaseData(aEvent, aCopyTargets);
 
-    delta = aEvent.delta;
-    isHorizontal = aEvent.isHorizontal;
+    mDelta = aEvent.mDelta;
+    mIsHorizontal = aEvent.mIsHorizontal;
   }
 };