зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1259664 part.7 Rename WidgetWheelEvent::isMomentum to WidgetWheelEvent::mIsMomentum r=smaug
MozReview-Commit-ID: CornLj3WkyG --HG-- extra : rebase_source : 2566b30374ed1a5be7cf0c6fead25a0271d58d17
This commit is contained in:
Родитель
9d2172e67c
Коммит
3b08c541b4
|
@ -797,7 +797,7 @@ nsDOMWindowUtils::SendWheelEvent(float aX,
|
|||
wheelEvent.mDeltaY = aDeltaY;
|
||||
wheelEvent.mDeltaZ = aDeltaZ;
|
||||
wheelEvent.mDeltaMode = aDeltaMode;
|
||||
wheelEvent.isMomentum =
|
||||
wheelEvent.mIsMomentum =
|
||||
(aOptions & WHEEL_EVENT_CAUSED_BY_MOMENTUM) != 0;
|
||||
wheelEvent.mIsNoLineOrPageDelta =
|
||||
(aOptions & WHEEL_EVENT_CAUSED_BY_NO_LINE_OR_PAGE_DELTA_DEVICE) != 0;
|
||||
|
|
|
@ -2626,8 +2626,8 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
|
|||
}
|
||||
|
||||
nsIScrollableFrame::ScrollMomentum momentum =
|
||||
aEvent->isMomentum ? nsIScrollableFrame::SYNTHESIZED_MOMENTUM_EVENT
|
||||
: nsIScrollableFrame::NOT_MOMENTUM;
|
||||
aEvent->mIsMomentum ? nsIScrollableFrame::SYNTHESIZED_MOMENTUM_EVENT
|
||||
: nsIScrollableFrame::NOT_MOMENTUM;
|
||||
|
||||
nsIntPoint overflow;
|
||||
aScrollableFrame->ScrollBy(actualDevPixelScrollAmount,
|
||||
|
@ -5696,7 +5696,7 @@ EventStateManager::WheelPrefs::ComputeActionFor(WidgetWheelEvent* aEvent)
|
|||
}
|
||||
|
||||
// Momentum events shouldn't run special actions.
|
||||
if (aEvent->isMomentum) {
|
||||
if (aEvent->mIsMomentum) {
|
||||
// Use the default action. Note that user might kill the wheel scrolling.
|
||||
Init(INDEX_DEFAULT);
|
||||
return (actions[INDEX_DEFAULT] == ACTION_SCROLL) ? ACTION_SCROLL :
|
||||
|
|
|
@ -393,7 +393,7 @@ PanGestureInput::ToWidgetWheelEvent(nsIWidget* aWidget) const
|
|||
wheelEvent.buttons = 0;
|
||||
wheelEvent.mDeltaMode = nsIDOMWheelEvent::DOM_DELTA_PIXEL;
|
||||
wheelEvent.mMayHaveMomentum = true; // pan inputs may have momentum
|
||||
wheelEvent.isMomentum = IsMomentum();
|
||||
wheelEvent.mIsMomentum = IsMomentum();
|
||||
wheelEvent.lineOrPageDeltaX = mLineOrPageDeltaX;
|
||||
wheelEvent.lineOrPageDeltaY = mLineOrPageDeltaY;
|
||||
wheelEvent.mDeltaX = mPanDisplacement.x;
|
||||
|
@ -471,7 +471,7 @@ ScrollWheelInput::ScrollWheelInput(const WidgetWheelEvent& aWheelEvent)
|
|||
, mUserDeltaMultiplierX(1.0)
|
||||
, mUserDeltaMultiplierY(1.0)
|
||||
, mMayHaveMomentum(aWheelEvent.mMayHaveMomentum)
|
||||
, mIsMomentum(aWheelEvent.isMomentum)
|
||||
, mIsMomentum(aWheelEvent.mIsMomentum)
|
||||
, mAllowToOverrideSystemScrollSpeed(
|
||||
aWheelEvent.mAllowToOverrideSystemScrollSpeed)
|
||||
{
|
||||
|
@ -493,7 +493,7 @@ ScrollWheelInput::ToWidgetWheelEvent(nsIWidget* aWidget) const
|
|||
wheelEvent.buttons = 0;
|
||||
wheelEvent.mDeltaMode = DeltaModeForDeltaType(mDeltaType);
|
||||
wheelEvent.mMayHaveMomentum = mMayHaveMomentum;
|
||||
wheelEvent.isMomentum = mIsMomentum;
|
||||
wheelEvent.mIsMomentum = mIsMomentum;
|
||||
wheelEvent.mDeltaX = mDeltaX;
|
||||
wheelEvent.mDeltaY = mDeltaY;
|
||||
wheelEvent.lineOrPageDeltaX = mLineOrPageDeltaX;
|
||||
|
|
|
@ -453,7 +453,7 @@ private:
|
|||
, mDeltaZ(0.0)
|
||||
, mDeltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
|
||||
, mCustomizedByUserPrefs(false)
|
||||
, isMomentum(false)
|
||||
, mIsMomentum(false)
|
||||
, mIsNoLineOrPageDelta(false)
|
||||
, lineOrPageDeltaX(0)
|
||||
, lineOrPageDeltaY(0)
|
||||
|
@ -477,7 +477,7 @@ public:
|
|||
, mDeltaMode(nsIDOMWheelEvent::DOM_DELTA_PIXEL)
|
||||
, mCustomizedByUserPrefs(false)
|
||||
, mMayHaveMomentum(false)
|
||||
, isMomentum(false)
|
||||
, mIsMomentum(false)
|
||||
, mIsNoLineOrPageDelta(false)
|
||||
, lineOrPageDeltaX(0)
|
||||
, lineOrPageDeltaY(0)
|
||||
|
@ -531,7 +531,7 @@ public:
|
|||
// true if the momentum events directly tied to this event may follow it.
|
||||
bool mMayHaveMomentum;
|
||||
// true if the event is caused by momentum.
|
||||
bool isMomentum;
|
||||
bool mIsMomentum;
|
||||
|
||||
// If device event handlers don't know when they should set lineOrPageDeltaX
|
||||
// and lineOrPageDeltaY, this is true. Otherwise, false.
|
||||
|
@ -616,7 +616,7 @@ public:
|
|||
mDeltaMode = aEvent.mDeltaMode;
|
||||
mCustomizedByUserPrefs = aEvent.mCustomizedByUserPrefs;
|
||||
mMayHaveMomentum = aEvent.mMayHaveMomentum;
|
||||
isMomentum = aEvent.isMomentum;
|
||||
mIsMomentum = aEvent.mIsMomentum;
|
||||
mIsNoLineOrPageDelta = aEvent.mIsNoLineOrPageDelta;
|
||||
lineOrPageDeltaX = aEvent.lineOrPageDeltaX;
|
||||
lineOrPageDeltaY = aEvent.lineOrPageDeltaY;
|
||||
|
|
|
@ -5154,7 +5154,7 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
|||
outWheelEvent->mDeltaMode =
|
||||
usePreciseDeltas ? nsIDOMWheelEvent::DOM_DELTA_PIXEL
|
||||
: nsIDOMWheelEvent::DOM_DELTA_LINE;
|
||||
outWheelEvent->isMomentum = nsCocoaUtils::IsMomentumScrollEvent(aMouseEvent);
|
||||
outWheelEvent->mIsMomentum = nsCocoaUtils::IsMomentumScrollEvent(aMouseEvent);
|
||||
}
|
||||
|
||||
- (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent
|
||||
|
|
|
@ -166,7 +166,7 @@ struct ParamTraits<mozilla::WidgetWheelEvent>
|
|||
WriteParam(aMsg, aParam.mDeltaMode);
|
||||
WriteParam(aMsg, aParam.mCustomizedByUserPrefs);
|
||||
WriteParam(aMsg, aParam.mMayHaveMomentum);
|
||||
WriteParam(aMsg, aParam.isMomentum);
|
||||
WriteParam(aMsg, aParam.mIsMomentum);
|
||||
WriteParam(aMsg, aParam.mIsNoLineOrPageDelta);
|
||||
WriteParam(aMsg, aParam.lineOrPageDeltaX);
|
||||
WriteParam(aMsg, aParam.lineOrPageDeltaY);
|
||||
|
@ -190,7 +190,7 @@ struct ParamTraits<mozilla::WidgetWheelEvent>
|
|||
ReadParam(aMsg, aIter, &aResult->mDeltaMode) &&
|
||||
ReadParam(aMsg, aIter, &aResult->mCustomizedByUserPrefs) &&
|
||||
ReadParam(aMsg, aIter, &aResult->mMayHaveMomentum) &&
|
||||
ReadParam(aMsg, aIter, &aResult->isMomentum) &&
|
||||
ReadParam(aMsg, aIter, &aResult->mIsMomentum) &&
|
||||
ReadParam(aMsg, aIter, &aResult->mIsNoLineOrPageDelta) &&
|
||||
ReadParam(aMsg, aIter, &aResult->lineOrPageDeltaX) &&
|
||||
ReadParam(aMsg, aIter, &aResult->lineOrPageDeltaY) &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче