Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Issue 12040032: Merge 140104 (Closed)

Created:
7 years, 11 months ago by yosin_UTC9
Modified:
7 years, 11 months ago
Reviewers:
yosin_UTC9
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Visibility:
Public.

Description

Merge 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 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+12 lines, -13 lines) Patch
A + LayoutTests/platform/chromium-win/fast/events/panScroll-click.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/platform/chromium-win/fast/events/panScroll-click-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/platform/chromium-win/fast/events/panScroll-drag.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/platform/chromium-win/fast/events/panScroll-drag-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/platform/chromium/TestExpectations View 1 chunk +3 lines, -0 lines 0 comments Download
M Source/WebCore/page/AutoscrollController.h View 2 chunks +1 line, -2 lines 0 comments Download
M Source/WebCore/page/AutoscrollController.cpp View 6 chunks +12 lines, -15 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
yosin_UTC9
7 years, 11 months ago (2013-01-23 01:31:32 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698