Bug 1259665 part.2 Rename WidgetPointerEvent::height to mHeight r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Wed, 03 Aug 2016 17:23:56 +0900
changeset 307956 af975c87031b59df5a9babdb6ae6b01e25c11c43
parent 307955 9e70575bfe319ed62db1cc2e7971e6e799733fde
child 307957 a9cc7c3437525533fb9643f45d4eb2a727b747bc
push id30524
push userkwierso@gmail.com
push dateWed, 03 Aug 2016 21:02:04 +0000
treeherdermozilla-central@de6fd5bb93d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1259665
milestone51.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 1259665 part.2 Rename WidgetPointerEvent::height to mHeight r=smaug MozReview-Commit-ID: Ji4X53dByiH
dom/base/nsDOMWindowUtils.cpp
dom/events/EventStateManager.cpp
dom/events/PointerEvent.cpp
layout/base/nsPresShell.cpp
widget/MouseEvents.h
widget/nsGUIEventIPC.h
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -760,17 +760,17 @@ nsDOMWindowUtils::SendPointerEventCommon
   WidgetPointerEvent event(true, msg, widget);
   event.mModifiers = nsContentUtils::GetWidgetModifiers(aModifiers);
   event.button = aButton;
   event.buttons = nsContentUtils::GetButtonsFlagForButton(aButton);
   event.pressure = aPressure;
   event.inputSource = aInputSourceArg;
   event.pointerId = aPointerId;
   event.mWidth = aWidth;
-  event.height = aHeight;
+  event.mHeight = aHeight;
   event.tiltX = aTiltX;
   event.tiltY = aTiltY;
   event.isPrimary = (nsIDOMMouseEvent::MOZ_SOURCE_MOUSE == aInputSourceArg) ? true : aIsPrimary;
   event.mClickCount = aClickCount;
   event.mTime = PR_IntervalNow();
   event.mFlags.mIsSynthesizedForTests = aOptionalArgCount >= 10 ? aIsSynthesized : true;
 
   nsPresContext* presContext = GetPresContext();
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -3832,17 +3832,17 @@ CreateMouseOrPointerWidgetEvent(WidgetMo
 
     nsAutoPtr<WidgetPointerEvent> newPointerEvent;
     newPointerEvent =
       new WidgetPointerEvent(aMouseEvent->IsTrusted(), aMessage,
                              aMouseEvent->mWidget);
     newPointerEvent->isPrimary = sourcePointer->isPrimary;
     newPointerEvent->pointerId = sourcePointer->pointerId;
     newPointerEvent->mWidth = sourcePointer->mWidth;
-    newPointerEvent->height = sourcePointer->height;
+    newPointerEvent->mHeight = sourcePointer->mHeight;
     newPointerEvent->inputSource = sourcePointer->inputSource;
     newPointerEvent->relatedTarget =
       nsIPresShell::GetPointerCapturingContent(sourcePointer->pointerId)
         ? nullptr
         : aRelatedContent;
     aNewEvent = newPointerEvent.forget();
   } else {
     aNewEvent =
--- a/dom/events/PointerEvent.cpp
+++ b/dom/events/PointerEvent.cpp
@@ -83,17 +83,17 @@ PointerEvent::Constructor(EventTarget* a
                     aParam.mScreenY, aParam.mClientX, aParam.mClientY,
                     false, false, false, false, aParam.mButton,
                     aParam.mRelatedTarget);
   e->InitializeExtraMouseEventDictionaryMembers(aParam);
 
   WidgetPointerEvent* widgetEvent = e->mEvent->AsPointerEvent();
   widgetEvent->pointerId = aParam.mPointerId;
   widgetEvent->mWidth = aParam.mWidth;
-  widgetEvent->height = aParam.mHeight;
+  widgetEvent->mHeight = aParam.mHeight;
   widgetEvent->pressure = aParam.mPressure;
   widgetEvent->tiltX = aParam.mTiltX;
   widgetEvent->tiltY = aParam.mTiltY;
   widgetEvent->inputSource = ConvertStringToPointerType(aParam.mPointerType);
   widgetEvent->isPrimary = aParam.mIsPrimary;
   widgetEvent->buttons = aParam.mButtons;
 
   e->SetTrusted(trusted);
@@ -127,17 +127,17 @@ int32_t
 PointerEvent::Width()
 {
   return mEvent->AsPointerEvent()->mWidth;
 }
 
 int32_t
 PointerEvent::Height()
 {
-  return mEvent->AsPointerEvent()->height;
+  return mEvent->AsPointerEvent()->mHeight;
 }
 
 float
 PointerEvent::Pressure()
 {
   return mEvent->AsPointerEvent()->pressure;
 }
 
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -7196,17 +7196,17 @@ DispatchPointerFromMouseOrTouch(PresShel
 
       WidgetPointerEvent event(touchEvent->IsTrusted(), pointerMessage,
                                touchEvent->mWidget);
       event.isPrimary = i == 0;
       event.pointerId = touch->Identifier();
       event.mRefPoint = touch->mRefPoint;
       event.mModifiers = touchEvent->mModifiers;
       event.mWidth = touch->RadiusX();
-      event.height = touch->RadiusY();
+      event.mHeight = touch->RadiusY();
       event.tiltX = touch->tiltX;
       event.tiltY = touch->tiltY;
       event.mTime = touchEvent->mTime;
       event.mTimeStamp = touchEvent->mTimeStamp;
       event.mFlags = touchEvent->mFlags;
       event.button = WidgetMouseEvent::eLeftButton;
       event.buttons = WidgetMouseEvent::eLeftButtonFlag;
       event.inputSource = nsIDOMMouseEvent::MOZ_SOURCE_TOUCH;
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -662,36 +662,36 @@ private:
 
 class WidgetPointerEvent : public WidgetMouseEvent
 {
   friend class mozilla::dom::PBrowserParent;
   friend class mozilla::dom::PBrowserChild;
 
   WidgetPointerEvent()
     : mWidth(0)
-    , height(0)
+    , mHeight(0)
     , isPrimary(true)
   {
   }
 
 public:
   virtual WidgetPointerEvent* AsPointerEvent() override { return this; }
 
   WidgetPointerEvent(bool aIsTrusted, EventMessage aMsg, nsIWidget* w)
     : WidgetMouseEvent(aIsTrusted, aMsg, w, ePointerEventClass, eReal)
     , mWidth(0)
-    , height(0)
+    , mHeight(0)
     , isPrimary(true)
   {
   }
 
   explicit WidgetPointerEvent(const WidgetMouseEvent& aEvent)
     : WidgetMouseEvent(aEvent)
     , mWidth(0)
-    , height(0)
+    , mHeight(0)
     , isPrimary(true)
   {
     mClass = ePointerEventClass;
   }
 
   virtual WidgetEvent* Duplicate() const override
   {
     MOZ_ASSERT(mClass == ePointerEventClass,
@@ -700,26 +700,26 @@ public:
     WidgetPointerEvent* result =
       new WidgetPointerEvent(false, mMessage, nullptr);
     result->AssignPointerEventData(*this, true);
     result->mFlags = mFlags;
     return result;
   }
 
   uint32_t mWidth;
-  uint32_t height;
+  uint32_t mHeight;
   bool isPrimary;
 
   // XXX Not tested by test_assign_event_data.html
   void AssignPointerEventData(const WidgetPointerEvent& aEvent,
                               bool aCopyTargets)
   {
     AssignMouseEventData(aEvent, aCopyTargets);
 
     mWidth = aEvent.mWidth;
-    height = aEvent.height;
+    mHeight = aEvent.mHeight;
     isPrimary = aEvent.isPrimary;
   }
 };
 
 } // namespace mozilla
 
 #endif // mozilla_MouseEvents_h__
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
@@ -283,29 +283,29 @@ struct ParamTraits<mozilla::WidgetPointe
 {
   typedef mozilla::WidgetPointerEvent paramType;
 
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, static_cast<mozilla::WidgetMouseEvent>(aParam));
     WriteParam(aMsg, aParam.pointerId);
     WriteParam(aMsg, aParam.mWidth);
-    WriteParam(aMsg, aParam.height);
+    WriteParam(aMsg, aParam.mHeight);
     WriteParam(aMsg, aParam.tiltX);
     WriteParam(aMsg, aParam.tiltY);
     WriteParam(aMsg, aParam.isPrimary);
   }
 
   static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
   {
     bool rv =
       ReadParam(aMsg, aIter, static_cast<mozilla::WidgetMouseEvent*>(aResult)) &&
       ReadParam(aMsg, aIter, &aResult->pointerId) &&
       ReadParam(aMsg, aIter, &aResult->mWidth) &&
-      ReadParam(aMsg, aIter, &aResult->height) &&
+      ReadParam(aMsg, aIter, &aResult->mHeight) &&
       ReadParam(aMsg, aIter, &aResult->tiltX) &&
       ReadParam(aMsg, aIter, &aResult->tiltY) &&
       ReadParam(aMsg, aIter, &aResult->isPrimary);
     return rv;
   }
 };
 
 template<>