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

Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org> (Closed)

Created:
9 years, 6 months ago by Nico
Modified:
9 years, 6 months ago
Reviewers:
commit-queue
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/782/
Visibility:
Public.

Description

Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>; Reviewed by Mihai Parparita. Chromium Mac: Fork ScrollAnimatorMac to ScrollAnimatorChromiumMac for overlay scrollbar support https://bugs.webkit.org/show_bug.cgi?id=59753 No new tests. Just forking ScrollAnimatorMac to ScrollAnimatorChromiumMac. * WebCore.gyp/WebCore.gyp: Added IntPointMac.mm. This is used by some functions in ScrollAnimatorChromiumMac. Also added filters for conflicting class names in ScrollAnimatorChromiumMac. * WebCore.gypi: Added ScrollAnimatorChromiumMac.h/mm. * platform/ScrollAnimator.cpp: Extended the #ifdef around ScrollAnimator::create() so that the chromium version will be created. * platform/chromium/ScrollAnimatorChromiumMac.h: Added. (WebCore::ScrollAnimatorChromiumMac::setIsDrawingIntoLayer): (WebCore::ScrollAnimatorChromiumMac::isDrawingIntoLayer): (WebCore::ScrollAnimatorChromiumMac::haveScrolledSincePageLoad): * platform/chromium/ScrollAnimatorChromiumMac.mm: Added. Forked from ScrollAnimatorMac and replaced all instances of ScrollAnimatorMac with ScrollAnimatorChromiumMac and ScrollbarThemeMac with ScrollbarThemeChromiumMac. Removed the ENABLE(SMOOTH_SCROLLING) around the file. Stubbed out ScrollAnimatorChromiumMac::scroll() if smooth scrolling is disabled. (abs): (-[ScrollAnimationHelperDelegate initWithScrollAnimator:WebCore::]): (-[ScrollAnimationHelperDelegate scrollAnimatorDestroyed]): (-[ScrollAnimationHelperDelegate bounds]): (-[ScrollAnimationHelperDelegate _immediateScrollToPoint:]): (-[ScrollAnimationHelperDelegate _pixelAlignProposedScrollPosition:]): (-[ScrollAnimationHelperDelegate convertSizeToBase:]): (-[ScrollAnimationHelperDelegate convertSizeFromBase:]): (-[ScrollAnimationHelperDelegate convertSizeToBacking:]): (-[ScrollAnimationHelperDelegate convertSizeFromBacking:]): (-[ScrollAnimationHelperDelegate superview]): (-[ScrollAnimationHelperDelegate documentView]): (-[ScrollAnimationHelperDelegate window]): (-[ScrollAnimationHelperDelegate _recursiveRecomputeToolTips]): (-[ScrollbarPainterControllerDelegate initWithScrollAnimator:WebCore::]): (-[ScrollbarPainterControllerDelegate scrollAnimatorDestroyed]): (-[ScrollbarPainterControllerDelegate contentAreaRectForScrollerImpPair:]): (-[ScrollbarPainterControllerDelegate inLiveResizeForScrollerImpPair:]): (-[ScrollbarPainterControllerDelegate mouseLocationInContentAreaForScrollerImpPair:]): (-[ScrollbarPainterControllerDelegate scrollerImpPair:convertContentPoint:toScrollerImp:]): (-[ScrollbarPainterControllerDelegate scrollerImpPair:setContentAreaNeedsDisplayInRect:]): (-[ScrollbarPainterControllerDelegate scrollerImpPair:updateScrollerStyleForNewRecommendedScrollerStyle:]): (-[ScrollbarPartAnimation initWithScrollbarPainter:part:WebCore::scrollAnimator:WebCore::animateAlphaTo:duration:]): (-[ScrollbarPartAnimation setCurrentProgress:]): (-[ScrollbarPartAnimation scrollAnimatorDestroyed]): (-[ScrollbarPainterDelegate initWithScrollAnimator:WebCore::]): (-[ScrollbarPainterDelegate cancelAnimations]): (-[ScrollbarPainterDelegate convertRectToBacking:]): (-[ScrollbarPainterDelegate convertRectFromBacking:]): (-[ScrollbarPainterDelegate layer]): (-[ScrollbarPainterDelegate setUpAnimation:scrollerPainter:part:WebCore::animateAlphaTo:duration:]): (-[ScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]): (-[ScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]): (-[ScrollbarPainterDelegate scrollerImp:overlayScrollerStateChangedTo:]): (-[ScrollbarPainterDelegate scrollAnimatorDestroyed]): (WebCore::ScrollAnimator::create): (WebCore::ScrollAnimatorChromiumMac::ScrollAnimatorChromiumMac): (WebCore::ScrollAnimatorChromiumMac::~ScrollAnimatorChromiumMac): (WebCore::ScrollAnimatorChromiumMac::scroll): (WebCore::ScrollAnimatorChromiumMac::scrollToOffsetWithoutAnimation): (WebCore::ScrollAnimatorChromiumMac::adjustScrollXPositionIfNecessary): (WebCore::ScrollAnimatorChromiumMac::adjustScrollYPositionIfNecessary): (WebCore::ScrollAnimatorChromiumMac::adjustScrollPositionIfNecessary): (WebCore::ScrollAnimatorChromiumMac::immediateScrollToPoint): (WebCore::ScrollAnimatorChromiumMac::immediateScrollByDeltaX): (WebCore::ScrollAnimatorChromiumMac::immediateScrollByDeltaY): (WebCore::ScrollAnimatorChromiumMac::notityPositionChanged): (WebCore::ScrollAnimatorChromiumMac::contentAreaWillPaint): (WebCore::ScrollAnimatorChromiumMac::mouseEnteredContentArea): (WebCore::ScrollAnimatorChromiumMac::mouseExitedContentArea): (WebCore::ScrollAnimatorChromiumMac::mouseMovedInContentArea): (WebCore::ScrollAnimatorChromiumMac::willStartLiveResize): (WebCore::ScrollAnimatorChromiumMac::contentsResized): (WebCore::ScrollAnimatorChromiumMac::willEndLiveResize): (WebCore::ScrollAnimatorChromiumMac::contentAreaDidShow): (WebCore::ScrollAnimatorChromiumMac::contentAreaDidHide): (WebCore::ScrollAnimatorChromiumMac::didBeginScrollGesture): (WebCore::ScrollAnimatorChromiumMac::didEndScrollGesture): (WebCore::ScrollAnimatorChromiumMac::didAddVerticalScrollbar): (WebCore::ScrollAnimatorChromiumMac::willRemoveVerticalScrollbar): (WebCore::ScrollAnimatorChromiumMac::didAddHorizontalScrollbar): (WebCore::ScrollAnimatorChromiumMac::willRemoveHorizontalScrollbar): (WebCore::ScrollAnimatorChromiumMac::cancelAnimations): (WebCore::elasticDeltaForTimeDelta): (WebCore::elasticDeltaForReboundDelta): (WebCore::reboundDeltaForElasticDelta): (WebCore::scrollWheelMultiplier): (WebCore::ScrollAnimatorChromiumMac::handleWheelEvent): (WebCore::ScrollAnimatorChromiumMac::handleGestureEvent): (WebCore::ScrollAnimatorChromiumMac::pinnedInDirection): (WebCore::ScrollAnimatorChromiumMac::allowsVerticalStretching): (WebCore::ScrollAnimatorChromiumMac::allowsHorizontalStretching): (WebCore::ScrollAnimatorChromiumMac::smoothScrollWithEvent): (WebCore::ScrollAnimatorChromiumMac::beginScrollGesture): (WebCore::ScrollAnimatorChromiumMac::endScrollGesture): (WebCore::ScrollAnimatorChromiumMac::snapRubberBand): (WebCore::roundTowardZero): (WebCore::roundToDevicePixelTowardZero): (WebCore::ScrollAnimatorChromiumMac::snapRubberBandTimerFired): (WebCore::ScrollAnimatorChromiumMac::startScrollbarPaintTimer): (WebCore::ScrollAnimatorChromiumMac::scrollbarPaintTimerIsActive): (WebCore::ScrollAnimatorChromiumMac::stopScrollbarPaintTimer): (WebCore::ScrollAnimatorChromiumMac::initialScrollbarPaintTimerFired): (WebCore::ScrollAnimatorChromiumMac::setVisibleScrollerThumbRect): * platform/graphics/IntPoint.h: Exposed NSPoint conversion routines to chromium mac. TBR=commit-queue@webkit.org Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=88459

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+8 lines, -1403 lines) Patch
M Source/WebCore/ChangeLog View 1 chunk +0 lines, -1402 lines 0 comments Download
M Source/WebCore/WebCore.gypi View 1 chunk +2 lines, -0 lines 0 comments Download
M Source/WebCore/WebCore.gyp/WebCore.gyp View 2 chunks +5 lines, -0 lines 0 comments Download
M Source/WebCore/platform/ScrollAnimator.cpp View 1 chunk +1 line, -1 line 0 comments Download
A + Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h View 0 chunks +-1 lines, --1 lines 0 comments Download
A + Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/platform/graphics/IntPoint.h View 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Nico
9 years, 6 months ago (2011-06-09 18:04:11 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698