--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -799,17 +799,17 @@ nsDOMWindowUtils::SendWheelEvent(float a
wheelEvent.mDeltaMode = aDeltaMode;
wheelEvent.mIsMomentum =
(aOptions & WHEEL_EVENT_CAUSED_BY_MOMENTUM) != 0;
wheelEvent.mIsNoLineOrPageDelta =
(aOptions & WHEEL_EVENT_CAUSED_BY_NO_LINE_OR_PAGE_DELTA_DEVICE) != 0;
wheelEvent.mCustomizedByUserPrefs =
(aOptions & WHEEL_EVENT_CUSTOMIZED_BY_USER_PREFS) != 0;
wheelEvent.mLineOrPageDeltaX = aLineOrPageDeltaX;
- wheelEvent.lineOrPageDeltaY = aLineOrPageDeltaY;
+ wheelEvent.mLineOrPageDeltaY = aLineOrPageDeltaY;
wheelEvent.widget = widget;
wheelEvent.mTime = PR_Now() / 1000;
nsPresContext* presContext = GetPresContext();
NS_ENSURE_TRUE(presContext, NS_ERROR_FAILURE);
wheelEvent.refPoint = nsContentUtils::ToWidgetPoint(CSSPoint(aX, aY), offset, presContext);
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2186,33 +2186,33 @@ EventStateManager::DispatchLegacyMouseSc
int32_t scrollDeltaX, scrollDeltaY, pixelDeltaX, pixelDeltaY;
switch (aEvent->mDeltaMode) {
case nsIDOMWheelEvent::DOM_DELTA_PAGE:
scrollDeltaX =
!aEvent->mLineOrPageDeltaX ? 0 :
(aEvent->mLineOrPageDeltaX > 0 ? nsIDOMUIEvent::SCROLL_PAGE_DOWN :
nsIDOMUIEvent::SCROLL_PAGE_UP);
scrollDeltaY =
- !aEvent->lineOrPageDeltaY ? 0 :
- (aEvent->lineOrPageDeltaY > 0 ? nsIDOMUIEvent::SCROLL_PAGE_DOWN :
- nsIDOMUIEvent::SCROLL_PAGE_UP);
+ !aEvent->mLineOrPageDeltaY ? 0 :
+ (aEvent->mLineOrPageDeltaY > 0 ? nsIDOMUIEvent::SCROLL_PAGE_DOWN :
+ nsIDOMUIEvent::SCROLL_PAGE_UP);
pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width);
pixelDeltaY = RoundDown(aEvent->mDeltaY * scrollAmountInCSSPixels.height);
break;
case nsIDOMWheelEvent::DOM_DELTA_LINE:
scrollDeltaX = aEvent->mLineOrPageDeltaX;
- scrollDeltaY = aEvent->lineOrPageDeltaY;
+ scrollDeltaY = aEvent->mLineOrPageDeltaY;
pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width);
pixelDeltaY = RoundDown(aEvent->mDeltaY * scrollAmountInCSSPixels.height);
break;
case nsIDOMWheelEvent::DOM_DELTA_PIXEL:
scrollDeltaX = aEvent->mLineOrPageDeltaX;
- scrollDeltaY = aEvent->lineOrPageDeltaY;
+ scrollDeltaY = aEvent->mLineOrPageDeltaY;
pixelDeltaX = RoundDown(aEvent->mDeltaX);
pixelDeltaY = RoundDown(aEvent->mDeltaY);
break;
default:
MOZ_CRASH("Invalid deltaMode value comes");
}
@@ -5388,17 +5388,17 @@ EventStateManager::DeltaAccumulator::Ini
return;
}
mX += aEvent->mDeltaX;
mY += aEvent->mDeltaY;
if (mHandlingDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL) {
// Records pixel delta values and init mLineOrPageDeltaX and
- // lineOrPageDeltaY for wheel events which are caused by pixel only
+ // mLineOrPageDeltaY for wheel events which are caused by pixel only
// devices. Ignore mouse wheel transaction for computing this. The
// lineOrPageDelta values will be used by dispatching legacy
// eMouseScrollEventClass (DOMMouseScroll) but not be used for scrolling
// of default action. The transaction should be used only for the default
// action.
nsIFrame* frame =
aESM->ComputeScrollTarget(aTargetFrame, aEvent,
COMPUTE_LEGACY_MOUSE_SCROLL_EVENT_TARGET);
@@ -5406,25 +5406,25 @@ EventStateManager::DeltaAccumulator::Ini
frame ? frame->PresContext() : aTargetFrame->PresContext();
nsIScrollableFrame* scrollTarget = do_QueryFrame(frame);
nsSize scrollAmount = aESM->GetScrollAmount(pc, aEvent, scrollTarget);
nsIntSize scrollAmountInCSSPixels(
nsPresContext::AppUnitsToIntCSSPixels(scrollAmount.width),
nsPresContext::AppUnitsToIntCSSPixels(scrollAmount.height));
aEvent->mLineOrPageDeltaX = RoundDown(mX) / scrollAmountInCSSPixels.width;
- aEvent->lineOrPageDeltaY = RoundDown(mY) / scrollAmountInCSSPixels.height;
+ aEvent->mLineOrPageDeltaY = RoundDown(mY) / scrollAmountInCSSPixels.height;
mX -= aEvent->mLineOrPageDeltaX * scrollAmountInCSSPixels.width;
- mY -= aEvent->lineOrPageDeltaY * scrollAmountInCSSPixels.height;
+ mY -= aEvent->mLineOrPageDeltaY * scrollAmountInCSSPixels.height;
} else {
aEvent->mLineOrPageDeltaX = RoundDown(mX);
- aEvent->lineOrPageDeltaY = RoundDown(mY);
+ aEvent->mLineOrPageDeltaY = RoundDown(mY);
mX -= aEvent->mLineOrPageDeltaX;
- mY -= aEvent->lineOrPageDeltaY;
+ mY -= aEvent->mLineOrPageDeltaY;
}
mLastTime = TimeStamp::Now();
}
void
EventStateManager::DeltaAccumulator::Reset()
{
@@ -5644,20 +5644,20 @@ EventStateManager::WheelPrefs::ApplyUser
aEvent->mDeltaY *= mMultiplierY[index];
aEvent->mDeltaZ *= mMultiplierZ[index];
// If the multiplier is 1.0 or -1.0, i.e., it doesn't change the absolute
// value, we should use lineOrPageDelta values which were set by widget.
// Otherwise, we need to compute them from accumulated delta values.
if (!NeedToComputeLineOrPageDelta(aEvent)) {
aEvent->mLineOrPageDeltaX *= static_cast<int32_t>(mMultiplierX[index]);
- aEvent->lineOrPageDeltaY *= static_cast<int32_t>(mMultiplierY[index]);
+ aEvent->mLineOrPageDeltaY *= static_cast<int32_t>(mMultiplierY[index]);
} else {
aEvent->mLineOrPageDeltaX = 0;
- aEvent->lineOrPageDeltaY = 0;
+ aEvent->mLineOrPageDeltaY = 0;
}
aEvent->mCustomizedByUserPrefs =
((mMultiplierX[index] != 1.0) || (mMultiplierY[index] != 1.0) ||
(mMultiplierZ[index] != 1.0));
}
void
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -2188,17 +2188,17 @@ TranslateToNPCocoaEvent(WidgetGUIEvent*
NS_WARNING("eMouseUp/DOWN is not a WidgetMouseEvent?");
}
break;
}
case eLegacyMouseLineOrPageScroll: {
WidgetWheelEvent* wheelEvent = anEvent->AsWheelEvent();
if (wheelEvent) {
cocoaEvent.data.mouse.deltaX = wheelEvent->mLineOrPageDeltaX;
- cocoaEvent.data.mouse.deltaY = wheelEvent->lineOrPageDeltaY;
+ cocoaEvent.data.mouse.deltaY = wheelEvent->mLineOrPageDeltaY;
} else {
NS_WARNING("eLegacyMouseLineOrPageScroll is not a WidgetWheelEvent? "
"(could be, haven't checked)");
}
break;
}
case eKeyDown:
case eKeyUp:
@@ -2380,36 +2380,36 @@ nsEventStatus nsPluginInstanceOwner::Pro
break;
}
// For plugins which don't support high-resolution scroll, we should
// generate legacy resolution wheel messages. I.e., the delta value
// should be WHEEL_DELTA * n.
case eWheel: {
const WidgetWheelEvent* wheelEvent = anEvent.AsWheelEvent();
int32_t delta = 0;
- if (wheelEvent->lineOrPageDeltaY) {
+ if (wheelEvent->mLineOrPageDeltaY) {
switch (wheelEvent->mDeltaMode) {
case nsIDOMWheelEvent::DOM_DELTA_PAGE:
pluginEvent.event = WM_MOUSEWHEEL;
- delta = -WHEEL_DELTA * wheelEvent->lineOrPageDeltaY;
+ delta = -WHEEL_DELTA * wheelEvent->mLineOrPageDeltaY;
break;
case nsIDOMWheelEvent::DOM_DELTA_LINE: {
UINT linesPerWheelDelta = 0;
if (NS_WARN_IF(!::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0,
&linesPerWheelDelta, 0))) {
// Use system default scroll amount, 3, when
// SPI_GETWHEELSCROLLLINES isn't available.
linesPerWheelDelta = 3;
}
if (!linesPerWheelDelta) {
break;
}
pluginEvent.event = WM_MOUSEWHEEL;
- delta = -WHEEL_DELTA / linesPerWheelDelta *
- wheelEvent->lineOrPageDeltaY;
+ delta = -WHEEL_DELTA / linesPerWheelDelta;
+ delta *= wheelEvent->mLineOrPageDeltaY;
break;
}
case nsIDOMWheelEvent::DOM_DELTA_PIXEL:
default:
// We don't support WM_GESTURE with this path.
MOZ_ASSERT(!pluginEvent.event);
break;
}
--- a/widget/InputData.cpp
+++ b/widget/InputData.cpp
@@ -390,17 +390,17 @@ PanGestureInput::ToWidgetWheelEvent(nsIW
wheelEvent.refPoint =
RoundedToInt(ViewAs<LayoutDevicePixel>(mPanStartPoint,
PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent));
wheelEvent.buttons = 0;
wheelEvent.mDeltaMode = nsIDOMWheelEvent::DOM_DELTA_PIXEL;
wheelEvent.mMayHaveMomentum = true; // pan inputs may have momentum
wheelEvent.mIsMomentum = IsMomentum();
wheelEvent.mLineOrPageDeltaX = mLineOrPageDeltaX;
- wheelEvent.lineOrPageDeltaY = mLineOrPageDeltaY;
+ wheelEvent.mLineOrPageDeltaY = mLineOrPageDeltaY;
wheelEvent.mDeltaX = mPanDisplacement.x;
wheelEvent.mDeltaY = mPanDisplacement.y;
wheelEvent.mFlags.mHandledByAPZ = mHandledByAPZ;
return wheelEvent;
}
bool
PanGestureInput::TransformToLocal(const ScreenToParentLayerMatrix4x4& aTransform)
@@ -461,17 +461,17 @@ ScrollWheelInput::ScrollWheelInput(const
aWheelEvent.mTimeStamp,
aWheelEvent.mModifiers)
, mDeltaType(DeltaTypeForDeltaMode(aWheelEvent.mDeltaMode))
, mScrollMode(SCROLLMODE_INSTANT)
, mHandledByAPZ(aWheelEvent.mFlags.mHandledByAPZ)
, mDeltaX(aWheelEvent.mDeltaX)
, mDeltaY(aWheelEvent.mDeltaY)
, mLineOrPageDeltaX(aWheelEvent.mLineOrPageDeltaX)
- , mLineOrPageDeltaY(aWheelEvent.lineOrPageDeltaY)
+ , mLineOrPageDeltaY(aWheelEvent.mLineOrPageDeltaY)
, mScrollSeriesNumber(0)
, mUserDeltaMultiplierX(1.0)
, mUserDeltaMultiplierY(1.0)
, mMayHaveMomentum(aWheelEvent.mMayHaveMomentum)
, mIsMomentum(aWheelEvent.mIsMomentum)
, mAllowToOverrideSystemScrollSpeed(
aWheelEvent.mAllowToOverrideSystemScrollSpeed)
{
@@ -492,17 +492,17 @@ ScrollWheelInput::ToWidgetWheelEvent(nsI
PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent));
wheelEvent.buttons = 0;
wheelEvent.mDeltaMode = DeltaModeForDeltaType(mDeltaType);
wheelEvent.mMayHaveMomentum = mMayHaveMomentum;
wheelEvent.mIsMomentum = mIsMomentum;
wheelEvent.mDeltaX = mDeltaX;
wheelEvent.mDeltaY = mDeltaY;
wheelEvent.mLineOrPageDeltaX = mLineOrPageDeltaX;
- wheelEvent.lineOrPageDeltaY = mLineOrPageDeltaY;
+ wheelEvent.mLineOrPageDeltaY = mLineOrPageDeltaY;
wheelEvent.mAllowToOverrideSystemScrollSpeed =
mAllowToOverrideSystemScrollSpeed;
wheelEvent.mFlags.mHandledByAPZ = mHandledByAPZ;
return wheelEvent;
}
bool
ScrollWheelInput::TransformToLocal(const ScreenToParentLayerMatrix4x4& aTransform)
--- a/widget/MouseEvents.h
+++ b/widget/MouseEvents.h
@@ -451,17 +451,17 @@ private:
: mDeltaX(0.0)
, mDeltaY(0.0)
, mDeltaZ(0.0)
, mDeltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
, mCustomizedByUserPrefs(false)
, mIsMomentum(false)
, mIsNoLineOrPageDelta(false)
, mLineOrPageDeltaX(0)
- , lineOrPageDeltaY(0)
+ , mLineOrPageDeltaY(0)
, mScrollType(SCROLL_DEFAULT)
, overflowDeltaX(0.0)
, overflowDeltaY(0.0)
, mViewPortIsOverscrolled(false)
, mCanTriggerSwipe(false)
, mAllowToOverrideSystemScrollSpeed(false)
{
}
@@ -475,17 +475,17 @@ public:
, mDeltaY(0.0)
, mDeltaZ(0.0)
, mDeltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
, mCustomizedByUserPrefs(false)
, mMayHaveMomentum(false)
, mIsMomentum(false)
, mIsNoLineOrPageDelta(false)
, mLineOrPageDeltaX(0)
- , lineOrPageDeltaY(0)
+ , mLineOrPageDeltaY(0)
, mScrollType(SCROLL_DEFAULT)
, overflowDeltaX(0.0)
, overflowDeltaY(0.0)
, mViewPortIsOverscrolled(false)
, mCanTriggerSwipe(false)
, mAllowToOverrideSystemScrollSpeed(true)
{
}
@@ -529,47 +529,47 @@ public:
bool mCustomizedByUserPrefs;
// true if the momentum events directly tied to this event may follow it.
bool mMayHaveMomentum;
// true if the event is caused by momentum.
bool mIsMomentum;
// If device event handlers don't know when they should set mLineOrPageDeltaX
- // and lineOrPageDeltaY, this is true. Otherwise, false.
+ // and mLineOrPageDeltaY, this is true. Otherwise, false.
// If mIsNoLineOrPageDelta is true, ESM will generate
// eLegacyMouseLineOrPageScroll events when accumulated delta values reach
// a line height.
bool mIsNoLineOrPageDelta;
// If widget sets mLineOrPageDelta, EventStateManager will dispatch
// eLegacyMouseLineOrPageScroll event for compatibility. Note that the delta
// value means pages if the mDeltaMode is DOM_DELTA_PAGE, otherwise, lines.
int32_t mLineOrPageDeltaX;
- int32_t lineOrPageDeltaY;
+ int32_t mLineOrPageDeltaY;
// When the default action for an wheel event is moving history or zooming,
// need to chose a delta value for doing it.
int32_t GetPreferredIntDelta()
{
- if (!mLineOrPageDeltaX && !lineOrPageDeltaY) {
+ if (!mLineOrPageDeltaX && !mLineOrPageDeltaY) {
return 0;
}
- if (lineOrPageDeltaY && !mLineOrPageDeltaX) {
- return lineOrPageDeltaY;
+ if (mLineOrPageDeltaY && !mLineOrPageDeltaX) {
+ return mLineOrPageDeltaY;
}
- if (mLineOrPageDeltaX && !lineOrPageDeltaY) {
+ if (mLineOrPageDeltaX && !mLineOrPageDeltaY) {
return mLineOrPageDeltaX;
}
- if ((mLineOrPageDeltaX < 0 && lineOrPageDeltaY > 0) ||
- (mLineOrPageDeltaX > 0 && lineOrPageDeltaY < 0)) {
+ if ((mLineOrPageDeltaX < 0 && mLineOrPageDeltaY > 0) ||
+ (mLineOrPageDeltaX > 0 && mLineOrPageDeltaY < 0)) {
return 0; // We cannot guess the answer in this case.
}
- return (Abs(mLineOrPageDeltaX) > Abs(lineOrPageDeltaY)) ?
- mLineOrPageDeltaX : lineOrPageDeltaY;
+ return (Abs(mLineOrPageDeltaX) > Abs(mLineOrPageDeltaY)) ?
+ mLineOrPageDeltaX : mLineOrPageDeltaY;
}
// Scroll type
// The default value is SCROLL_DEFAULT, which means EventStateManager will
// select preferred scroll type automatically.
enum ScrollType
{
SCROLL_DEFAULT,
@@ -614,17 +614,17 @@ public:
mDeltaY = aEvent.mDeltaY;
mDeltaZ = aEvent.mDeltaZ;
mDeltaMode = aEvent.mDeltaMode;
mCustomizedByUserPrefs = aEvent.mCustomizedByUserPrefs;
mMayHaveMomentum = aEvent.mMayHaveMomentum;
mIsMomentum = aEvent.mIsMomentum;
mIsNoLineOrPageDelta = aEvent.mIsNoLineOrPageDelta;
mLineOrPageDeltaX = aEvent.mLineOrPageDeltaX;
- lineOrPageDeltaY = aEvent.lineOrPageDeltaY;
+ mLineOrPageDeltaY = aEvent.mLineOrPageDeltaY;
mScrollType = aEvent.mScrollType;
overflowDeltaX = aEvent.overflowDeltaX;
overflowDeltaY = aEvent.overflowDeltaY;
mViewPortIsOverscrolled = aEvent.mViewPortIsOverscrolled;
mCanTriggerSwipe = aEvent.mCanTriggerSwipe;
mAllowToOverrideSystemScrollSpeed =
aEvent.mAllowToOverrideSystemScrollSpeed;
}
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -3200,20 +3200,20 @@ nsWindow::OnScrollEvent(GdkEventScroll *
if (source == GDK_SOURCE_TOUCHSCREEN ||
source == GDK_SOURCE_TOUCHPAD) {
wheelEvent.mScrollType = WidgetWheelEvent::SCROLL_ASYNCHRONOUSELY;
}
break;
}
#endif
case GDK_SCROLL_UP:
- wheelEvent.mDeltaY = wheelEvent.lineOrPageDeltaY = -3;
+ wheelEvent.mDeltaY = wheelEvent.mLineOrPageDeltaY = -3;
break;
case GDK_SCROLL_DOWN:
- wheelEvent.mDeltaY = wheelEvent.lineOrPageDeltaY = 3;
+ wheelEvent.mDeltaY = wheelEvent.mLineOrPageDeltaY = 3;
break;
case GDK_SCROLL_LEFT:
wheelEvent.mDeltaX = wheelEvent.mLineOrPageDeltaX = -1;
break;
case GDK_SCROLL_RIGHT:
wheelEvent.mDeltaX = wheelEvent.mLineOrPageDeltaX = 1;
break;
}
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
@@ -164,17 +164,17 @@ struct ParamTraits<mozilla::WidgetWheelE
WriteParam(aMsg, aParam.mDeltaY);
WriteParam(aMsg, aParam.mDeltaZ);
WriteParam(aMsg, aParam.mDeltaMode);
WriteParam(aMsg, aParam.mCustomizedByUserPrefs);
WriteParam(aMsg, aParam.mMayHaveMomentum);
WriteParam(aMsg, aParam.mIsMomentum);
WriteParam(aMsg, aParam.mIsNoLineOrPageDelta);
WriteParam(aMsg, aParam.mLineOrPageDeltaX);
- WriteParam(aMsg, aParam.lineOrPageDeltaY);
+ WriteParam(aMsg, aParam.mLineOrPageDeltaY);
WriteParam(aMsg, static_cast<int32_t>(aParam.mScrollType));
WriteParam(aMsg, aParam.overflowDeltaX);
WriteParam(aMsg, aParam.overflowDeltaY);
WriteParam(aMsg, aParam.mViewPortIsOverscrolled);
WriteParam(aMsg, aParam.mCanTriggerSwipe);
WriteParam(aMsg, aParam.mAllowToOverrideSystemScrollSpeed);
}
@@ -188,17 +188,17 @@ struct ParamTraits<mozilla::WidgetWheelE
ReadParam(aMsg, aIter, &aResult->mDeltaY) &&
ReadParam(aMsg, aIter, &aResult->mDeltaZ) &&
ReadParam(aMsg, aIter, &aResult->mDeltaMode) &&
ReadParam(aMsg, aIter, &aResult->mCustomizedByUserPrefs) &&
ReadParam(aMsg, aIter, &aResult->mMayHaveMomentum) &&
ReadParam(aMsg, aIter, &aResult->mIsMomentum) &&
ReadParam(aMsg, aIter, &aResult->mIsNoLineOrPageDelta) &&
ReadParam(aMsg, aIter, &aResult->mLineOrPageDeltaX) &&
- ReadParam(aMsg, aIter, &aResult->lineOrPageDeltaY) &&
+ ReadParam(aMsg, aIter, &aResult->mLineOrPageDeltaY) &&
ReadParam(aMsg, aIter, &scrollType) &&
ReadParam(aMsg, aIter, &aResult->overflowDeltaX) &&
ReadParam(aMsg, aIter, &aResult->overflowDeltaY) &&
ReadParam(aMsg, aIter, &aResult->mViewPortIsOverscrolled) &&
ReadParam(aMsg, aIter, &aResult->mCanTriggerSwipe) &&
ReadParam(aMsg, aIter, &aResult->mAllowToOverrideSystemScrollSpeed);
aResult->mScrollType =
static_cast<mozilla::WidgetWheelEvent::ScrollType>(scrollType);
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -1272,17 +1272,17 @@ nsWindow::wheelEvent(QWheelEvent* aEvent
// this is opposite Gecko usage.
// TODO: Store the unused delta values due to fraction round and add it
// to next event. The stored values should be reset by other
// direction scroll event.
int32_t delta = (int)(aEvent->delta() / WHEEL_DELTA) * -3;
switch (aEvent->orientation()) {
case Qt::Vertical:
- wheelEvent.mDeltaY = wheelEvent.lineOrPageDeltaY = delta;
+ wheelEvent.mDeltaY = wheelEvent.mLineOrPageDeltaY = delta;
break;
case Qt::Horizontal:
wheelEvent.mDeltaX = wheelEvent.mLineOrPageDeltaX = delta;
break;
default:
Q_ASSERT(0);
break;
}
--- a/widget/windows/WinMouseScrollHandler.cpp
+++ b/widget/windows/WinMouseScrollHandler.cpp
@@ -673,17 +673,17 @@ MouseScrollHandler::HandleScrollMessageA
mIsWaitingInternalMessage = false;
ModifierKeyState modKeyState = GetModifierKeyState(aMessage);
WidgetWheelEvent wheelEvent(true, eWheel, aWidget);
double& delta =
(aMessage == MOZ_WM_VSCROLL) ? wheelEvent.mDeltaY : wheelEvent.mDeltaX;
int32_t& lineOrPageDelta =
- (aMessage == MOZ_WM_VSCROLL) ? wheelEvent.lineOrPageDeltaY :
+ (aMessage == MOZ_WM_VSCROLL) ? wheelEvent.mLineOrPageDeltaY :
wheelEvent.mLineOrPageDeltaX;
delta = 1.0;
lineOrPageDelta = 1;
switch (LOWORD(aWParam)) {
case SB_PAGEUP:
delta = -1.0;
@@ -707,22 +707,22 @@ MouseScrollHandler::HandleScrollMessageA
// is received. We need to know the actual mouse cursor position when
// the original message was received.
InitEvent(aWidget, wheelEvent);
MOZ_LOG(gMouseScrollLog, LogLevel::Info,
("MouseScroll::HandleScrollMessageAsMouseWheelMessage: aWidget=%p, "
"aMessage=MOZ_WM_%sSCROLL, aWParam=0x%08X, aLParam=0x%08X, "
"wheelEvent { refPoint: { x: %d, y: %d }, mDeltaX: %f, mDeltaY: %f, "
- "mLineOrPageDeltaX: %d, lineOrPageDeltaY: %d, "
+ "mLineOrPageDeltaX: %d, mLineOrPageDeltaY: %d, "
"isShift: %s, isControl: %s, isAlt: %s, isMeta: %s }",
aWidget, (aMessage == MOZ_WM_VSCROLL) ? "V" : "H", aWParam, aLParam,
wheelEvent.refPoint.x, wheelEvent.refPoint.y,
wheelEvent.mDeltaX, wheelEvent.mDeltaY,
- wheelEvent.mLineOrPageDeltaX, wheelEvent.lineOrPageDeltaY,
+ wheelEvent.mLineOrPageDeltaX, wheelEvent.mLineOrPageDeltaY,
GetBoolName(wheelEvent.IsShift()),
GetBoolName(wheelEvent.IsControl()),
GetBoolName(wheelEvent.IsAlt()),
GetBoolName(wheelEvent.IsMeta())));
aWidget->DispatchWheelEvent(&wheelEvent);
}
@@ -844,17 +844,17 @@ MouseScrollHandler::LastEventInfo::InitW
// But positive native delta value means to top or right.
// Use orienter for computing our delta value with native delta value.
int32_t orienter = mIsVertical ? -1 : 1;
aWheelEvent.mDeltaMode = mIsPage ? nsIDOMWheelEvent::DOM_DELTA_PAGE :
nsIDOMWheelEvent::DOM_DELTA_LINE;
double& delta = mIsVertical ? aWheelEvent.mDeltaY : aWheelEvent.mDeltaX;
- int32_t& lineOrPageDelta = mIsVertical ? aWheelEvent.lineOrPageDeltaY :
+ int32_t& lineOrPageDelta = mIsVertical ? aWheelEvent.mLineOrPageDeltaY :
aWheelEvent.mLineOrPageDeltaX;
double nativeDeltaPerUnit =
mIsPage ? static_cast<double>(WHEEL_DELTA) :
static_cast<double>(WHEEL_DELTA) / GetScrollAmount();
delta = static_cast<double>(mDelta) * orienter / nativeDeltaPerUnit;
mAccumulatedDelta += mDelta;
@@ -892,23 +892,23 @@ MouseScrollHandler::LastEventInfo::InitW
aWheelEvent.mAllowToOverrideSystemScrollSpeed = false;
}
}
}
MOZ_LOG(gMouseScrollLog, LogLevel::Info,
("MouseScroll::LastEventInfo::InitWheelEvent: aWidget=%p, "
"aWheelEvent { refPoint: { x: %d, y: %d }, mDeltaX: %f, mDeltaY: %f, "
- "mLineOrPageDeltaX: %d, lineOrPageDeltaY: %d, "
+ "mLineOrPageDeltaX: %d, mLineOrPageDeltaY: %d, "
"isShift: %s, isControl: %s, isAlt: %s, isMeta: %s, "
"mAllowToOverrideSystemScrollSpeed: %s }, "
"mAccumulatedDelta: %d",
aWidget, aWheelEvent.refPoint.x, aWheelEvent.refPoint.y,
aWheelEvent.mDeltaX, aWheelEvent.mDeltaY,
- aWheelEvent.mLineOrPageDeltaX, aWheelEvent.lineOrPageDeltaY,
+ aWheelEvent.mLineOrPageDeltaX, aWheelEvent.mLineOrPageDeltaY,
GetBoolName(aWheelEvent.IsShift()),
GetBoolName(aWheelEvent.IsControl()),
GetBoolName(aWheelEvent.IsAlt()),
GetBoolName(aWheelEvent.IsMeta()),
GetBoolName(aWheelEvent.mAllowToOverrideSystemScrollSpeed),
mAccumulatedDelta));
return (delta != 0);
--- a/widget/windows/nsWinGesture.cpp
+++ b/widget/windows/nsWinGesture.cpp
@@ -561,17 +561,17 @@ nsWinGesture::PanFeedbackFinalize(HWND h
UpdatePanningFeedback(hWnd, mPixelScrollOverflow.x, mPixelScrollOverflow.y, mPanInertiaActive);
}
bool
nsWinGesture::PanDeltaToPixelScroll(WidgetWheelEvent& aWheelEvent)
{
aWheelEvent.mDeltaX = aWheelEvent.mDeltaY = aWheelEvent.mDeltaZ = 0.0;
- aWheelEvent.mLineOrPageDeltaX = aWheelEvent.lineOrPageDeltaY = 0;
+ aWheelEvent.mLineOrPageDeltaX = aWheelEvent.mLineOrPageDeltaY = 0;
aWheelEvent.refPoint.x = mPanRefPoint.x;
aWheelEvent.refPoint.y = mPanRefPoint.y;
aWheelEvent.mDeltaMode = nsIDOMWheelEvent::DOM_DELTA_PIXEL;
aWheelEvent.mScrollType = WidgetWheelEvent::SCROLL_SYNCHRONOUSLY;
aWheelEvent.mIsNoLineOrPageDelta = true;
aWheelEvent.overflowDeltaX = 0.0;