Changeset 88286 in webkit


Ignore:
Timestamp:
Jun 7, 2011 4:57:32 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

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.
Location:
trunk/Source/WebCore
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r88284 r88286  
     12011-06-07  Sailesh Agrawal  <sail@chromium.org>
     2
     3        Reviewed by Mihai Parparita.
     4
     5        Chromium Mac: Fork ScrollAnimatorMac to ScrollAnimatorChromiumMac for overlay scrollbar support
     6        https://bugs.webkit.org/show_bug.cgi?id=59753
     7
     8        No new tests. Just forking ScrollAnimatorMac to ScrollAnimatorChromiumMac.
     9
     10        * WebCore.gyp/WebCore.gyp: Added IntPointMac.mm. This is used by some functions in ScrollAnimatorChromiumMac. Also added filters for conflicting class names in ScrollAnimatorChromiumMac.
     11        * WebCore.gypi: Added ScrollAnimatorChromiumMac.h/mm.
     12        * platform/ScrollAnimator.cpp: Extended the #ifdef around ScrollAnimator::create() so that the chromium version will be created.
     13        * platform/chromium/ScrollAnimatorChromiumMac.h: Added.
     14        (WebCore::ScrollAnimatorChromiumMac::setIsDrawingIntoLayer):
     15        (WebCore::ScrollAnimatorChromiumMac::isDrawingIntoLayer):
     16        (WebCore::ScrollAnimatorChromiumMac::haveScrolledSincePageLoad):
     17        * 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.
     18        (abs):
     19        (-[ScrollAnimationHelperDelegate initWithScrollAnimator:WebCore::]):
     20        (-[ScrollAnimationHelperDelegate scrollAnimatorDestroyed]):
     21        (-[ScrollAnimationHelperDelegate bounds]):
     22        (-[ScrollAnimationHelperDelegate _immediateScrollToPoint:]):
     23        (-[ScrollAnimationHelperDelegate _pixelAlignProposedScrollPosition:]):
     24        (-[ScrollAnimationHelperDelegate convertSizeToBase:]):
     25        (-[ScrollAnimationHelperDelegate convertSizeFromBase:]):
     26        (-[ScrollAnimationHelperDelegate convertSizeToBacking:]):
     27        (-[ScrollAnimationHelperDelegate convertSizeFromBacking:]):
     28        (-[ScrollAnimationHelperDelegate superview]):
     29        (-[ScrollAnimationHelperDelegate documentView]):
     30        (-[ScrollAnimationHelperDelegate window]):
     31        (-[ScrollAnimationHelperDelegate _recursiveRecomputeToolTips]):
     32        (-[ScrollbarPainterControllerDelegate initWithScrollAnimator:WebCore::]):
     33        (-[ScrollbarPainterControllerDelegate scrollAnimatorDestroyed]):
     34        (-[ScrollbarPainterControllerDelegate contentAreaRectForScrollerImpPair:]):
     35        (-[ScrollbarPainterControllerDelegate inLiveResizeForScrollerImpPair:]):
     36        (-[ScrollbarPainterControllerDelegate mouseLocationInContentAreaForScrollerImpPair:]):
     37        (-[ScrollbarPainterControllerDelegate scrollerImpPair:convertContentPoint:toScrollerImp:]):
     38        (-[ScrollbarPainterControllerDelegate scrollerImpPair:setContentAreaNeedsDisplayInRect:]):
     39        (-[ScrollbarPainterControllerDelegate scrollerImpPair:updateScrollerStyleForNewRecommendedScrollerStyle:]):
     40        (-[ScrollbarPartAnimation initWithScrollbarPainter:part:WebCore::scrollAnimator:WebCore::animateAlphaTo:duration:]):
     41        (-[ScrollbarPartAnimation setCurrentProgress:]):
     42        (-[ScrollbarPartAnimation scrollAnimatorDestroyed]):
     43        (-[ScrollbarPainterDelegate initWithScrollAnimator:WebCore::]):
     44        (-[ScrollbarPainterDelegate cancelAnimations]):
     45        (-[ScrollbarPainterDelegate convertRectToBacking:]):
     46        (-[ScrollbarPainterDelegate convertRectFromBacking:]):
     47        (-[ScrollbarPainterDelegate layer]):
     48        (-[ScrollbarPainterDelegate setUpAnimation:scrollerPainter:part:WebCore::animateAlphaTo:duration:]):
     49        (-[ScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]):
     50        (-[ScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]):
     51        (-[ScrollbarPainterDelegate scrollerImp:overlayScrollerStateChangedTo:]):
     52        (-[ScrollbarPainterDelegate scrollAnimatorDestroyed]):
     53        (WebCore::ScrollAnimator::create):
     54        (WebCore::ScrollAnimatorChromiumMac::ScrollAnimatorChromiumMac):
     55        (WebCore::ScrollAnimatorChromiumMac::~ScrollAnimatorChromiumMac):
     56        (WebCore::ScrollAnimatorChromiumMac::scroll):
     57        (WebCore::ScrollAnimatorChromiumMac::scrollToOffsetWithoutAnimation):
     58        (WebCore::ScrollAnimatorChromiumMac::adjustScrollXPositionIfNecessary):
     59        (WebCore::ScrollAnimatorChromiumMac::adjustScrollYPositionIfNecessary):
     60        (WebCore::ScrollAnimatorChromiumMac::adjustScrollPositionIfNecessary):
     61        (WebCore::ScrollAnimatorChromiumMac::immediateScrollToPoint):
     62        (WebCore::ScrollAnimatorChromiumMac::immediateScrollByDeltaX):
     63        (WebCore::ScrollAnimatorChromiumMac::immediateScrollByDeltaY):
     64        (WebCore::ScrollAnimatorChromiumMac::notityPositionChanged):
     65        (WebCore::ScrollAnimatorChromiumMac::contentAreaWillPaint):
     66        (WebCore::ScrollAnimatorChromiumMac::mouseEnteredContentArea):
     67        (WebCore::ScrollAnimatorChromiumMac::mouseExitedContentArea):
     68        (WebCore::ScrollAnimatorChromiumMac::mouseMovedInContentArea):
     69        (WebCore::ScrollAnimatorChromiumMac::willStartLiveResize):
     70        (WebCore::ScrollAnimatorChromiumMac::contentsResized):
     71        (WebCore::ScrollAnimatorChromiumMac::willEndLiveResize):
     72        (WebCore::ScrollAnimatorChromiumMac::contentAreaDidShow):
     73        (WebCore::ScrollAnimatorChromiumMac::contentAreaDidHide):
     74        (WebCore::ScrollAnimatorChromiumMac::didBeginScrollGesture):
     75        (WebCore::ScrollAnimatorChromiumMac::didEndScrollGesture):
     76        (WebCore::ScrollAnimatorChromiumMac::didAddVerticalScrollbar):
     77        (WebCore::ScrollAnimatorChromiumMac::willRemoveVerticalScrollbar):
     78        (WebCore::ScrollAnimatorChromiumMac::didAddHorizontalScrollbar):
     79        (WebCore::ScrollAnimatorChromiumMac::willRemoveHorizontalScrollbar):
     80        (WebCore::ScrollAnimatorChromiumMac::cancelAnimations):
     81        (WebCore::elasticDeltaForTimeDelta):
     82        (WebCore::elasticDeltaForReboundDelta):
     83        (WebCore::reboundDeltaForElasticDelta):
     84        (WebCore::scrollWheelMultiplier):
     85        (WebCore::ScrollAnimatorChromiumMac::handleWheelEvent):
     86        (WebCore::ScrollAnimatorChromiumMac::handleGestureEvent):
     87        (WebCore::ScrollAnimatorChromiumMac::pinnedInDirection):
     88        (WebCore::ScrollAnimatorChromiumMac::allowsVerticalStretching):
     89        (WebCore::ScrollAnimatorChromiumMac::allowsHorizontalStretching):
     90        (WebCore::ScrollAnimatorChromiumMac::smoothScrollWithEvent):
     91        (WebCore::ScrollAnimatorChromiumMac::beginScrollGesture):
     92        (WebCore::ScrollAnimatorChromiumMac::endScrollGesture):
     93        (WebCore::ScrollAnimatorChromiumMac::snapRubberBand):
     94        (WebCore::roundTowardZero):
     95        (WebCore::roundToDevicePixelTowardZero):
     96        (WebCore::ScrollAnimatorChromiumMac::snapRubberBandTimerFired):
     97        (WebCore::ScrollAnimatorChromiumMac::startScrollbarPaintTimer):
     98        (WebCore::ScrollAnimatorChromiumMac::scrollbarPaintTimerIsActive):
     99        (WebCore::ScrollAnimatorChromiumMac::stopScrollbarPaintTimer):
     100        (WebCore::ScrollAnimatorChromiumMac::initialScrollbarPaintTimerFired):
     101        (WebCore::ScrollAnimatorChromiumMac::setVisibleScrollerThumbRect):
     102        * platform/graphics/IntPoint.h: Exposed NSPoint conversion routines to chromium mac.
     103
    11042011-06-07  Sam Weinig  <sam@webkit.org>
    2105
  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r87948 r88286  
    11511151              'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver',
    11521152              'WebFontCache=ChromiumWebCoreObjCWebFontCache',
     1153              'ScrollAnimationHelperDelegate=ChromiumWebCoreObjCScrollAnimationHelperDelegate',
     1154              'ScrollbarPainterControllerDelegate=ChromiumWebCoreObjCScrollbarPainterControllerDelegate',
     1155              'ScrollbarPainterDelegate=ChromiumWebCoreObjCScrollbarPainterDelegate',
     1156              'ScrollbarPartAnimation=ChromiumWebCoreObjCScrollbarPartAnimation',
    11531157            ],
    11541158            'include_dirs': [
     
    13691373            ['include', 'platform/graphics/mac/GlyphPageTreeNodeMac\\.cpp$'],
    13701374            ['include', 'platform/graphics/mac/GraphicsContextMac\\.mm$'],
     1375            ['include', 'platform/graphics/mac/IntPointMac\\.mm$'],
    13711376            ['include', 'platform/graphics/mac/IntRectMac\\.mm$'],
    13721377            ['include', 'platform/mac/BlockExceptions\\.mm$'],
  • trunk/Source/WebCore/WebCore.gypi

    r88273 r88286  
    38333833            'platform/chromium/PopupMenuPrivate.h',
    38343834            'platform/chromium/SSLKeyGeneratorChromium.cpp',
     3835            'platform/chromium/ScrollAnimatorChromiumMac.h',
     3836            'platform/chromium/ScrollAnimatorChromiumMac.mm',
    38353837            'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.h',
    38363838            'platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm',
  • trunk/Source/WebCore/platform/ScrollAnimator.cpp

    r87130 r88286  
    4242namespace WebCore {
    4343
    44 #if !ENABLE(SMOOTH_SCROLLING)
     44#if !ENABLE(SMOOTH_SCROLLING) && !(PLATFORM(CHROMIUM) && OS(DARWIN))
    4545PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
    4646{
  • trunk/Source/WebCore/platform/graphics/IntPoint.h

    r87878 r88286  
    3939
    4040
    41 #if PLATFORM(MAC)
     41#if OS(DARWIN)
    4242#ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    4343typedef struct CGPoint NSPoint;
     
    127127#endif
    128128
    129 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
     129#if OS(DARWIN) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)
    130130    explicit IntPoint(const NSPoint&); // don't do this implicitly since it's lossy
    131131    operator NSPoint() const;
Note: See TracChangeset for help on using the changeset viewer.