DescriptionMerge 140104
> REGRESSION(r137726): Spring Loaded Pan Scrolling doesn't stop
> https://bugs.webkit.org/show_bug.cgi?id=107205
>
> Reviewed by Hajime Morita.
>
> Source/WebCore:
>
> The bug is caused by forgetting to set true m_panScrollButtonPressed
> in AutoscrollController::startPanScroll().
>
> This patch changes state management during pan scroll by replacing
> m_panScrollButtonPressed and m_springLoadedPanScrollInProgress by
> m_autoscrollType with introducing new AutoscrollController state
> AutoscrollForPanCanStop.
>
> Tests: platform/chromium-win/fast/events/panScroll-click.html
> platform/chromium-win/fast/events/panScroll-drag.html
>
> * page/AutoscrollController.cpp:
> (WebCore::AutoscrollController::AutoscrollController): Changed to remove initialization of m_panScrollButtonPressed and m_springLoadedPanScrollInProgress.
> (WebCore::AutoscrollController::stopAutoscrollTimer): Changed to remove resetting m_panScrollButtonPressed and m_springLoadedPanScrollInProgress.
> (WebCore::AutoscrollController::handleMouseReleaseEvent): Changed to handle AutoscrollForPan and AutoscrollForPanCanStop.
> (WebCore::AutoscrollController::panScrollInProgress): Changed to check AutoscrollForPanCanStop too.
> (WebCore::AutoscrollController::startPanScrolling): Changed to remove setting of m_springLoadedPanScrollInProgress.
> (WebCore::AutoscrollController::autoscrollTimerFired): Changed to add case for AutoscrollForPanCanStop.
> (WebCore::AutoscrollController::updatePanScrollState): Chagned to use AutoscrollForPan and AutoscrollForPanCanStop.
> * page/AutoscrollController.h:
> (AutoscrollController): Changed to add AutoscrollForPanCanStop to AutoscrollType.
>
> LayoutTests:
>
> * platform/chromium-win/fast/events/panScroll-click-expected.txt: Added.
> * platform/chromium-win/fast/events/panScroll-click.html: Added.
> * platform/chromium-win/fast/events/panScroll-drag-expected.txt: Added.
> * platform/chromium-win/fast/events/panScroll-drag.html: Added.
> * platfrom/chromium/TestExpectations: Skip panScroll-{click,drag}.html for Android, Linux, and Mac.
>
TBR=yosin@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=140489
Patch Set 1 #
Messages
Total messages: 1 (0 generated)
|