Bug 1259663 - Clean up WidgetMouseScrollEvent. r?masayuki
MozReview-Commit-ID: F98luwO9y1N
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2298,18 +2298,18 @@ EventStateManager::SendLineScrollEvent(n
event.mFlags.mDefaultPrevented = aState.mDefaultPrevented;
event.mFlags.mDefaultPreventedByContent = aState.mDefaultPreventedByContent;
event.refPoint = aEvent->refPoint;
event.widget = aEvent->widget;
event.mTime = aEvent->mTime;
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;
EventDispatcher::Dispatch(targetContent, aTargetFrame->PresContext(),
&event, nullptr, &status);
aState.mDefaultPrevented =
event.DefaultPrevented() || status == nsEventStatus_eConsumeNoDefault;
aState.mDefaultPreventedByContent = event.DefaultPreventedByContent();
@@ -2338,18 +2338,18 @@ EventStateManager::SendPixelScrollEvent(
event.mFlags.mDefaultPrevented = aState.mDefaultPrevented;
event.mFlags.mDefaultPreventedByContent = aState.mDefaultPreventedByContent;
event.refPoint = aEvent->refPoint;
event.widget = aEvent->widget;
event.mTime = aEvent->mTime;
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;
EventDispatcher::Dispatch(targetContent, aTargetFrame->PresContext(),
&event, nullptr, &status);
aState.mDefaultPrevented =
event.DefaultPrevented() || status == nsEventStatus_eConsumeNoDefault;
aState.mDefaultPreventedByContent = event.DefaultPreventedByContent();
--- a/dom/events/MouseScrollEvent.cpp
+++ b/dom/events/MouseScrollEvent.cpp
@@ -24,17 +24,17 @@ MouseScrollEvent::MouseScrollEvent(Event
} else {
mEventIsInternal = true;
mEvent->mTime = PR_Now();
mEvent->refPoint.x = mEvent->refPoint.y = 0;
static_cast<WidgetMouseEventBase*>(mEvent)->inputSource =
nsIDOMMouseEvent::MOZ_SOURCE_UNKNOWN;
}
- mDetail = mEvent->AsMouseScrollEvent()->delta;
+ mDetail = mEvent->AsMouseScrollEvent()->mDelta;
}
NS_IMPL_ADDREF_INHERITED(MouseScrollEvent, MouseEvent)
NS_IMPL_RELEASE_INHERITED(MouseScrollEvent, MouseEvent)
NS_INTERFACE_MAP_BEGIN(MouseScrollEvent)
NS_INTERFACE_MAP_END_INHERITING(MouseEvent)
@@ -55,24 +55,24 @@ MouseScrollEvent::InitMouseScrollEvent(c
uint16_t aButton,
EventTarget* aRelatedTarget,
int32_t aAxis)
{
MouseEvent::InitMouseEvent(aType, aCanBubble, aCancelable, aView, aDetail,
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);
}
} // namespace dom
} // namespace mozilla
using namespace mozilla;
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -378,33 +378,33 @@ public:
* DOMMouseScroll and MozMousePixelScroll event. These events are NOT hanbled
* by ESM even if widget dispatches them. Use new WidgetWheelEvent instead.
******************************************************************************/
class WidgetMouseScrollEvent : public WidgetMouseEventBase
{
private:
WidgetMouseScrollEvent()
- : delta(0)
- , isHorizontal(false)
+ : mDelta(0)
+ , mIsHorizontal(false)
{
}
public:
virtual WidgetMouseScrollEvent* AsMouseScrollEvent() override
{
return this;
}
WidgetMouseScrollEvent(bool aIsTrusted, EventMessage aMessage,
nsIWidget* aWidget)
: WidgetMouseEventBase(aIsTrusted, aMessage, aWidget,
eMouseScrollEventClass)
- , delta(0)
- , isHorizontal(false)
+ , mDelta(0)
+ , mIsHorizontal(false)
{
}
virtual WidgetEvent* Duplicate() const override
{
MOZ_ASSERT(mClass == eMouseScrollEventClass,
"Duplicate() must be overridden by sub class");
// Not copying widget, it is a weak reference.
@@ -416,29 +416,29 @@ public:
}
// The delta value of mouse scroll event.
// If the event message is eLegacyMouseLineOrPageScroll, the value indicates
// scroll amount in lines. However, if the value is
// 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;
}
};
/******************************************************************************
* mozilla::WidgetWheelEvent
******************************************************************************/
class WidgetWheelEvent : public WidgetMouseEventBase