зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1259656 part.2 Rename WidgetEvent::lastRefPoint to WidgetEvent::mLastRefPoint r=smaug
MozReview-Commit-ID: D5jK0bMzMx6 --HG-- extra : rebase_source : 0cb6af75c3925e9c28b9d36abf018bdaa4ed0a69
This commit is contained in:
Родитель
cbe8f5268a
Коммит
7d1b358c67
|
@ -4217,7 +4217,7 @@ EventStateManager::GenerateMouseEnterExit(WidgetMouseEvent* aMouseEvent)
|
|||
// dispatching the centering move event to content.
|
||||
LayoutDeviceIntPoint center =
|
||||
GetWindowClientRectCenter(aMouseEvent->mWidget);
|
||||
aMouseEvent->lastRefPoint = center;
|
||||
aMouseEvent->mLastRefPoint = center;
|
||||
if (aMouseEvent->mRefPoint != center) {
|
||||
// Mouse move doesn't finish at the center of the window. Dispatch a
|
||||
// synthetic native mouse event to move the pointer back to the center
|
||||
|
@ -4240,9 +4240,9 @@ EventStateManager::GenerateMouseEnterExit(WidgetMouseEvent* aMouseEvent)
|
|||
// the first move we've encountered, or the mouse has just re-entered
|
||||
// the application window. We should report (0,0) movement for this
|
||||
// case, so make the current and previous mRefPoints the same.
|
||||
aMouseEvent->lastRefPoint = aMouseEvent->mRefPoint;
|
||||
aMouseEvent->mLastRefPoint = aMouseEvent->mRefPoint;
|
||||
} else {
|
||||
aMouseEvent->lastRefPoint = sLastRefPoint;
|
||||
aMouseEvent->mLastRefPoint = sLastRefPoint;
|
||||
}
|
||||
|
||||
// Update the last known mRefPoint with the current mRefPoint.
|
||||
|
|
|
@ -131,7 +131,7 @@ UIEvent::GetMovementPoint()
|
|||
|
||||
// Calculate the delta between the last screen point and the current one.
|
||||
nsIntPoint current = DevPixelsToCSSPixels(mEvent->mRefPoint, mPresContext);
|
||||
nsIntPoint last = DevPixelsToCSSPixels(mEvent->lastRefPoint, mPresContext);
|
||||
nsIntPoint last = DevPixelsToCSSPixels(mEvent->mLastRefPoint, mPresContext);
|
||||
return current - last;
|
||||
}
|
||||
|
||||
|
|
|
@ -272,7 +272,7 @@ protected:
|
|||
, mClass(aEventClassID)
|
||||
, mMessage(aMessage)
|
||||
, mRefPoint(0, 0)
|
||||
, lastRefPoint(0, 0)
|
||||
, mLastRefPoint(0, 0)
|
||||
, userType(nullptr)
|
||||
{
|
||||
MOZ_COUNT_CTOR(WidgetEvent);
|
||||
|
@ -294,7 +294,7 @@ public:
|
|||
, mClass(eBasicEventClass)
|
||||
, mMessage(aMessage)
|
||||
, mRefPoint(0, 0)
|
||||
, lastRefPoint(0, 0)
|
||||
, mLastRefPoint(0, 0)
|
||||
, userType(nullptr)
|
||||
{
|
||||
MOZ_COUNT_CTOR(WidgetEvent);
|
||||
|
@ -331,7 +331,7 @@ public:
|
|||
// in screen coordinates. Not modified by layout code.
|
||||
LayoutDeviceIntPoint mRefPoint;
|
||||
// The previous mRefPoint, if known, used to calculate mouse movement deltas.
|
||||
LayoutDeviceIntPoint lastRefPoint;
|
||||
LayoutDeviceIntPoint mLastRefPoint;
|
||||
// See BaseEventFlags definition for the detail.
|
||||
BaseEventFlags mFlags;
|
||||
|
||||
|
@ -350,7 +350,7 @@ public:
|
|||
// mClass should be initialized with the constructor.
|
||||
// mMessage should be initialized with the constructor.
|
||||
mRefPoint = aEvent.mRefPoint;
|
||||
// lastRefPoint doesn't need to be copied.
|
||||
// mLastRefPoint doesn't need to be copied.
|
||||
AssignEventTime(aEvent);
|
||||
// mFlags should be copied manually if it's necessary.
|
||||
userType = aEvent.userType;
|
||||
|
|
Загрузка…
Ссылка в новой задаче