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

Issue 3364013: Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>... (Closed)

Created:
10 years, 3 months ago by Peter Kasting
Modified:
9 years, 7 months ago
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/517/
Visibility:
Public.

Description

Merge 67001 - 2010-09-08 Peter Kasting <pkasting@google.com>; Reviewed by David Hyatt. Add smooth scrolling framework, and a Windows implementation. https://bugs.webkit.org/show_bug.cgi?id=32356 * wscript: Add Windows ScrollAnimator. 2010-09-08 Peter Kasting <pkasting@google.com>; Reviewed by David Hyatt. Add smooth scrolling framework, and a Windows implementation. https://bugs.webkit.org/show_bug.cgi?id=32356 * CMakeLists.txt: Add ScrollAnimator. * GNUmakefile.am: Add ScrollAnimator. * WebCore.gyp/WebCore.gyp: Add Windows ScrollAnimator. * WebCore.gypi: Add ScrollAnimator. * WebCore.pro: Add ScrollAnimator. * WebCore.vcproj/WebCore.vcproj: Add ScrollAnimator. * WebCore.xcodeproj/project.pbxproj: Add ScrollAnimator. * platform/ScrollAnimator.cpp: Added base implementation that does no animation. (WebCore::ScrollAnimator::create): (WebCore::ScrollAnimator::scroll): (WebCore::ScrollAnimator::setScrollPositionAndStopAnimation): * platform/ScrollAnimator.h: Added base implementation that does no animation. (WebCore::ScrollAnimator::ScrollAnimator): (WebCore::ScrollAnimator::~ScrollAnimator): * platform/ScrollAnimatorWin.cpp: Added Windows subclass that animates scrolls. (WebCore::ScrollAnimator::create): (WebCore::ScrollAnimatorWin::PerAxisData::PerAxisData): (WebCore::ScrollAnimatorWin::ScrollAnimatorWin): (WebCore::ScrollAnimatorWin::~ScrollAnimatorWin): (WebCore::ScrollAnimatorWin::scroll): (WebCore::ScrollAnimatorWin::setScrollPositionAndStopAnimation): (WebCore::ScrollAnimatorWin::accelerationTime): (WebCore::ScrollAnimatorWin::animationTimerFired): (WebCore::ScrollAnimatorWin::stopAnimationTimerIfNeeded): (WebCore::ScrollAnimatorWin::animateScroll): * platform/ScrollAnimatorWin.h: Added Windows subclass that animates scrolls. * platform/ScrollView.cpp: Implement new ScrollbarClient functions. Allow wheel scrolls to be animated. (WebCore::ScrollView::scrollSize): (WebCore::ScrollView::setScrollOffsetFromAnimation): (WebCore::ScrollView::updateScrollbars): (WebCore::ScrollView::wheelEvent): * platform/ScrollView.h: Implement new ScrollbarClient functions. * platform/Scrollbar.cpp: Allow ScrollAnimator to handle scrolls if present. (WebCore::Scrollbar::setValue): (WebCore::Scrollbar::scroll): (WebCore::Scrollbar::moveThumb): (WebCore::Scrollbar::setCurrentPos): (WebCore::Scrollbar::mouseMoved): * platform/Scrollbar.h: * platform/ScrollbarClient.cpp: Added to avoid having to make ScrollAnimator.h non-private. (WebCore::ScrollbarClient::ScrollbarClient): (WebCore::ScrollbarClient::~ScrollbarClient): (WebCore::ScrollbarClient::scroll): (WebCore::ScrollbarClient::setScrollPositionAndStopAnimation): * platform/ScrollbarClient.h: Add hooks for ScrollAnimator. (WebCore::ScrollbarClient::convertFromScrollbarToContainingView): (WebCore::ScrollbarClient::convertFromContainingViewToScrollbar): * platform/gtk/MainFrameScrollbarGtk.cpp: (MainFrameScrollbarGtk::gtkValueChanged): * platform/qt/ScrollbarQt.cpp: Use scroll() in preference to setValue(). (WebCore::Scrollbar::contextMenu): * platform/win/PopupMenuWin.cpp: Implement new ScrollbarClient functions. (WebCore::PopupMenuWin::scrollSize): (WebCore::PopupMenuWin::setScrollOffsetFromAnimation): * platform/win/PopupMenuWin.h: Implement new ScrollbarClient functions. * rendering/RenderDataGrid.cpp: Implement new ScrollbarClient functions. (WebCore::RenderDataGrid::scrollSize): (WebCore::RenderDataGrid::setScrollOffsetFromAnimation): * rendering/RenderDataGrid.h: Implement new ScrollbarClient functions. * rendering/RenderLayer.cpp: Implement new ScrollbarClient functions. (WebCore::RenderLayer::scrollToOffset): (WebCore::RenderLayer::scrollSize): (WebCore::RenderLayer::setScrollOffsetFromAnimation): (WebCore::RenderLayer::updateScrollInfoAfterLayout): * rendering/RenderLayer.h: Implement new ScrollbarClient functions. * rendering/RenderListBox.cpp: Implement new ScrollbarClient functions. (WebCore::RenderListBox::scrollToRevealElementAtListIndex): (WebCore::RenderListBox::scrollSize): (WebCore::RenderListBox::setScrollOffsetFromAnimation): (WebCore::RenderListBox::setScrollTop): * rendering/RenderListBox.h: Implement new ScrollbarClient functions. 2010-09-08 Peter Kasting <pkasting@google.com>; Reviewed by David Hyatt. Add smooth scrolling framework, and a Windows implementation. https://bugs.webkit.org/show_bug.cgi?id=32356 * src/WebScrollbarImpl.cpp: Plumb new ScrollbarClient functions. Allow wheel scrolls to be animated. (WebKit::WebScrollbarImpl::setLocation): (WebKit::WebScrollbarImpl::setValue): (WebKit::WebScrollbarImpl::scroll): (WebKit::WebScrollbarImpl::onMouseWheel): (WebKit::WebScrollbarImpl::onKeyDown): (WebKit::WebScrollbarImpl::setScrollOffsetFromAnimation): * src/WebScrollbarImpl.h: Plumb new ScrollbarClient functions. * src/win/WebInputEventFactory.cpp: Update comments now that we have smooth scrolling. (WebKit::WebInputEventFactory::mouseWheelEvent): 2010-09-08 Peter Kasting <pkasting@google.com>; Reviewed by David Hyatt. Add smooth scrolling framework, and a Windows implementation. https://bugs.webkit.org/show_bug.cgi?id=32356 * Api/qwebframe.cpp: (QWebFrame::setScrollBarValue): TBR=commit-queue@webkit.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67008

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+311 lines, -31 lines) Patch
M ChangeLog View 1 chunk +9 lines, -0 lines 0 comments Download
M WebCore/CMakeLists.txt View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/ChangeLog View 1 chunk +79 lines, -0 lines 0 comments Download
M WebCore/GNUmakefile.am View 3 chunks +5 lines, -0 lines 0 comments Download
M WebCore/WebCore.gypi View 2 chunks +5 lines, -0 lines 0 comments Download
M WebCore/WebCore.pro View 3 chunks +10 lines, -2 lines 0 comments Download
M WebCore/WebCore.gyp/WebCore.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/WebCore.vcproj/WebCore.vcproj View 2 chunks +20 lines, -0 lines 0 comments Download
M WebCore/WebCore.xcodeproj/project.pbxproj View 7 chunks +15 lines, -3 lines 0 comments Download
A + WebCore/platform/ScrollAnimator.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + WebCore/platform/ScrollAnimator.cpp View 0 chunks +-1 lines, --1 lines 0 comments Download
A + WebCore/platform/ScrollAnimatorWin.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + WebCore/platform/ScrollAnimatorWin.cpp View 0 chunks +-1 lines, --1 lines 0 comments Download
M WebCore/platform/ScrollView.h View 1 chunk +3 lines, -1 line 0 comments Download
M WebCore/platform/ScrollView.cpp View 4 chunks +22 lines, -3 lines 0 comments Download
M WebCore/platform/Scrollbar.h View 3 chunks +7 lines, -2 lines 0 comments Download
M WebCore/platform/Scrollbar.cpp View 4 chunks +11 lines, -6 lines 0 comments Download
M WebCore/platform/ScrollbarClient.h View 2 chunks +14 lines, -7 lines 0 comments Download
A + WebCore/platform/ScrollbarClient.cpp View 0 chunks +-1 lines, --1 lines 0 comments Download
M WebCore/platform/gtk/ScrollbarGtk.cpp View 1 chunk +1 line, -1 line 0 comments Download
M WebCore/platform/qt/ScrollbarQt.cpp View 1 chunk +3 lines, -3 lines 0 comments Download
M WebCore/platform/win/PopupMenuWin.h View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/platform/win/PopupMenuWin.cpp View 1 chunk +11 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderDataGrid.h View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderDataGrid.cpp View 1 chunk +11 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderLayer.h View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderLayer.cpp View 3 chunks +17 lines, -3 lines 0 comments Download
M WebCore/rendering/RenderListBox.h View 1 chunk +2 lines, -0 lines 0 comments Download
M WebCore/rendering/RenderListBox.cpp View 3 chunks +13 lines, -2 lines 0 comments Download
M WebKit/chromium/ChangeLog View 1 chunk +18 lines, -0 lines 0 comments Download
M WebKit/chromium/src/WebScrollbarImpl.h View 1 chunk +2 lines, -0 lines 0 comments Download
WebKit/chromium/src/WebScrollbarImpl.cpp View 3 chunks +12 lines, -2 lines 0 comments Download
M WebKit/chromium/src/win/WebInputEventFactory.cpp View 1 chunk +3 lines, -0 lines 0 comments Download
M WebKit/qt/Api/qwebframe.cpp View 1 chunk +1 line, -1 line 0 comments Download
M WebKit/qt/ChangeLog View 1 chunk +10 lines, -0 lines 0 comments Download
M wscript View 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Peter Kasting
10 years, 3 months ago (2010-09-08 20:28:17 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698