Bug 1259666 - Part 2 - Change panDirection to mPanDirection - r=masayuki
authorkshitija <kshitijakarkar@gmail.com>
Fri, 29 Apr 2016 03:34:46 -0700
changeset 297598 f42bfe716797f99da7128b4956ef4a2c03f47c98
parent 297597 11116e24295830044db1a9ce7990f05f18a21ddb
child 297599 1f6d43968b34c1d765d8fecd0a6b223e7cc4c5b7
push id30264
push userkwierso@gmail.com
push dateTue, 17 May 2016 20:52:53 +0000
treeherdermozilla-central@991f249a6ffa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1259666
milestone49.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
Bug 1259666 - Part 2 - Change panDirection to mPanDirection - r=masayuki MozReview-Commit-ID: JVLB0Z6JUFc
dom/events/EventStateManager.cpp
widget/TouchEvents.h
widget/windows/nsWindow.cpp
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2801,17 +2801,17 @@ EventStateManager::DecideGestureEvent(Wi
           panDirection = WidgetGestureNotifyEvent::ePanHorizontal;
           displayPanFeedback = true;
         }
       }
     } //scrollableFrame
   } //ancestor chain
 
   aEvent->displayPanFeedback = displayPanFeedback;
-  aEvent->panDirection = panDirection;
+  aEvent->mPanDirection = panDirection;
 }
 
 #ifdef XP_MACOSX
 static bool
 NodeAllowsClickThrough(nsINode* aNode)
 {
   while (aNode) {
     if (aNode->IsXULElement()) {
--- a/widget/TouchEvents.h
+++ b/widget/TouchEvents.h
@@ -34,17 +34,17 @@ public:
   virtual WidgetGestureNotifyEvent* AsGestureNotifyEvent() override
   {
     return this;
   }
 
   WidgetGestureNotifyEvent(bool aIsTrusted, EventMessage aMessage,
                            nsIWidget *aWidget)
     : WidgetGUIEvent(aIsTrusted, aMessage, aWidget, eGestureNotifyEventClass)
-    , panDirection(ePanNone)
+    , mPanDirection(ePanNone)
     , displayPanFeedback(false)
   {
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     // XXX Looks like this event is handled only in PostHandleEvent() of
     //     EventStateManager.  Therefore, it might be possible to handle this
@@ -65,25 +65,25 @@ public:
   enum PanDirection : PanDirectionType
   {
     ePanNone,
     ePanVertical,
     ePanHorizontal,
     ePanBoth
   };
 
-  PanDirection panDirection;
+  PanDirection mPanDirection;
   bool displayPanFeedback;
 
   void AssignGestureNotifyEventData(const WidgetGestureNotifyEvent& aEvent,
                                     bool aCopyTargets)
   {
     AssignGUIEventData(aEvent, aCopyTargets);
 
-    panDirection = aEvent.panDirection;
+    mPanDirection = aEvent.mPanDirection;
     displayPanFeedback = aEvent.displayPanFeedback;
   }
 };
 
 /******************************************************************************
  * mozilla::WidgetSimpleGestureEvent
  ******************************************************************************/
 
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -5635,17 +5635,17 @@ nsWindow::ProcessMessage(UINT msg, WPARA
         touchPoint.ScreenToClient(mWnd);
         WidgetGestureNotifyEvent gestureNotifyEvent(true, eGestureNotify, this);
         gestureNotifyEvent.mRefPoint =
           LayoutDeviceIntPoint::FromUnknownPoint(touchPoint);
         nsEventStatus status;
         DispatchEvent(&gestureNotifyEvent, status);
         mDisplayPanFeedback = gestureNotifyEvent.displayPanFeedback;
         if (!mTouchWindow)
-          mGesture.SetWinGestureSupport(mWnd, gestureNotifyEvent.panDirection);
+          mGesture.SetWinGestureSupport(mWnd, gestureNotifyEvent.mPanDirection);
       }
       result = false; //should always bubble to DefWindowProc
     }
     break;
 
     case WM_CLEAR:
     {
       WidgetContentCommandEvent command(true, eContentCommandDelete, this);