Bug 719320 fix bustage r=no

This commit is contained in:
Masayuki Nakano 2012-08-12 12:32:30 +09:00
parent 212cdce23a
commit 8074854719

View File

@ -2853,13 +2853,13 @@ nsEventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame,
nsIntPoint actualDevPixelScrollAmount(0, 0);
if (isDeltaModePixel) {
actualDevPixelScrollAmount.x = RoundDown(aEvent->deltaX);
actualDevPixelScrollAmount.y = RoundDown(aEvent->deltaY);
actualDevPixelScrollAmount.x = RoundDown(acceleratedDelta.deltaX);
actualDevPixelScrollAmount.y = RoundDown(acceleratedDelta.deltaY);
} else {
actualDevPixelScrollAmount.x =
RoundDown(scrollAmountInDevPixels.width * aEvent->deltaX);
RoundDown(scrollAmountInDevPixels.width * acceleratedDelta.deltaX);
actualDevPixelScrollAmount.y =
RoundDown(scrollAmountInDevPixels.height * aEvent->deltaY);
RoundDown(scrollAmountInDevPixels.height * acceleratedDelta.deltaY);
}
nsIAtom* origin = nullptr;
@ -3272,6 +3272,8 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
case WheelPrefs::ACTION_ZOOM:
DoScrollZoom(aTargetFrame, wheelEvent->GetPreferredIntDelta());
break;
default:
break;
}
*aStatus = nsEventStatus_eConsumeNoDefault;
}