blink: Rename platform/ methods to prefix with get when they collide.

third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

 /*
  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 478 matching lines @@
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     [_knobAlphaAnimation.get() stopAnimation];
     [_trackAlphaAnimation.get() stopAnimation];
     [_uiStateTransitionAnimation.get() stopAnimation];
     [_expansionTransitionAnimation.get() stopAnimation];
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
 - (ScrollAnimatorMac&)scrollAnimator
 {
-    return static_cast<ScrollAnimatorMac&>(_scrollbar->scrollableArea()->scrollAnimator());
+    return static_cast<ScrollAnimatorMac&>(_scrollbar->getScrollableArea()->scrollAnimator());
 }
 
 - (NSRect)convertRectToBacking:(NSRect)aRect
 {
     return aRect;
 }
 
 - (NSRect)convertRectFromBacking:(NSRect)aRect
 {
     return aRect;
 }
 
 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp
 {
     if (!_scrollbar)
         return NSZeroPoint;
 
     ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(*_scrollbar));
 
-    return _scrollbar->convertFromContainingWidget(_scrollbar->scrollableArea()->lastKnownMousePosition());
+    return _scrollbar->convertFromContainingWidget(_scrollbar->getScrollableArea()->lastKnownMousePosition());
 }
 
 - (void)setUpAlphaAnimation:(RetainPtr<BlinkScrollbarPartAnimation>&)scrollbarPartAnimation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(blink::ScrollbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration
 {
     // If the user has scrolled the page, then the scrollbars must be animated here.
     // This overrides the early returns.
     bool mustAnimate = [self scrollAnimator].haveScrolledSincePageLoad();
 
     if ([self scrollAnimator].scrollbarPaintTimerIsActive() && !mustAnimate)
         return;
 
-    if (_scrollbar->scrollableArea()->shouldSuspendScrollAnimations() && !mustAnimate) {
+    if (_scrollbar->getScrollableArea()->shouldSuspendScrollAnimations() && !mustAnimate) {
         [self scrollAnimator].startScrollbarPaintTimer();
         return;
     }
 
     // At this point, we are definitely going to animate now, so stop the timer.
     [self scrollAnimator].stopScrollbarPaintTimer();
 
     // If we are currently animating, stop
     if (scrollbarPartAnimation) {
         [scrollbarPartAnimation.get() stopAnimation];
@@ skipping 230 matching lines @@
     float newY = clampTo<float, float>(position.y(), minPos.y(), maxPos.y());
 
     return FloatPoint(newX, newY);
 }
 
 void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
 {
     FloatPoint adjustedPosition = adjustScrollPositionIfNecessary(newPosition);
 
     bool positionChanged = adjustedPosition != m_currentPos;
-    if (!positionChanged && !scrollableArea()->scrollOriginChanged())
+    if (!positionChanged && !getScrollableArea()->scrollOriginChanged())
         return;
 
     FloatSize delta = adjustedPosition - m_currentPos;
 
     m_currentPos = adjustedPosition;
     notifyContentAreaScrolled(delta);
     notifyPositionChanged();
 }
 
 void ScrollAnimatorMac::immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition)
 {
     ASSERT(m_scrollAnimationHelper);
     immediateScrollTo(newPosition);
 }
 
 void ScrollAnimatorMac::contentAreaWillPaint() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() contentAreaWillDraw];
 }
 
 void ScrollAnimatorMac::mouseEnteredContentArea() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() mouseEnteredContentArea];
 }
 
 void ScrollAnimatorMac::mouseExitedContentArea() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() mouseExitedContentArea];
 }
 
 void ScrollAnimatorMac::mouseMovedInContentArea() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() mouseMovedInContentArea];
 }
 
 void ScrollAnimatorMac::mouseEnteredScrollbar(Scrollbar& scrollbar) const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
 
     if (!supportsUIStateTransitionProgress())
         return;
     if (ScrollbarPainter painter = scrollbarPainterForScrollbar(scrollbar))
         [painter mouseEnteredScroller];
 }
 
 void ScrollAnimatorMac::mouseExitedScrollbar(Scrollbar& scrollbar) const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
 
     if (!supportsUIStateTransitionProgress())
         return;
     if (ScrollbarPainter painter = scrollbarPainterForScrollbar(scrollbar))
         [painter mouseExitedScroller];
 }
 
 void ScrollAnimatorMac::contentsResized() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() contentAreaDidResize];
 }
 
 void ScrollAnimatorMac::contentAreaDidShow() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() windowOrderedIn];
 }
 
 void ScrollAnimatorMac::contentAreaDidHide() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() windowOrderedOut];
 }
 
 void ScrollAnimatorMac::didBeginScrollGesture() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() beginScrollGesture];
 }
 
 void ScrollAnimatorMac::didEndScrollGesture() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() endScrollGesture];
 }
 
 void ScrollAnimatorMac::mayBeginScrollGesture() const
 {
-    if (!scrollableArea()->scrollbarsCanBeActive())
+    if (!getScrollableArea()->scrollbarsCanBeActive())
         return;
     [m_scrollbarPainterController.get() beginScrollGesture];
     [m_scrollbarPainterController.get() contentAreaScrolled];
 }
 
 void ScrollAnimatorMac::finishCurrentScrollAnimations()
 {
     [m_scrollbarPainterController.get() hideOverlayScrollers];
 }
 
@@ skipping 62 matching lines @@
     if (!painter)
         return false;
     return [painter knobAlpha] > 0;
 }
 
 void ScrollAnimatorMac::notifyContentAreaScrolled(const FloatSize& delta)
 {
     // This function is called when a page is going into the page cache, but the page
     // isn't really scrolling in that case. We should only pass the message on to the
     // ScrollbarPainterController when we're really scrolling on an active page.
-    if (scrollableArea()->scrollbarsCanBeActive())
+    if (getScrollableArea()->scrollbarsCanBeActive())
         sendContentAreaScrolledSoon(delta);
 }
 
 bool ScrollAnimatorMac::setScrollbarsVisibleForTesting(bool show)
 {
     if (show)
         [m_scrollbarPainterController.get() flashScrollers];
     else
         [m_scrollbarPainterController.get() hideOverlayScrollers];
 
@@ skipping 17 matching lines @@
     if (phase == PlatformWheelEventPhaseBegan)
         didBeginScrollGesture();
     else if (phase == PlatformWheelEventPhaseEnded || phase == PlatformWheelEventPhaseCancelled)
         didEndScrollGesture();
     else if (phase == PlatformWheelEventPhaseMayBegin)
         mayBeginScrollGesture();
 }
 
 void ScrollAnimatorMac::updateScrollerStyle()
 {
-    if (!scrollableArea()->scrollbarsCanBeActive()) {
+    if (!getScrollableArea()->scrollbarsCanBeActive()) {
         m_needsScrollerStyleUpdate = true;
         return;
     }
 
     ScrollbarThemeMac* macTheme = macOverlayScrollbarTheme();
     if (!macTheme) {
         m_needsScrollerStyleUpdate = false;
         return;
     }
 
     NSScrollerStyle newStyle = [m_scrollbarPainterController.get() scrollerStyle];
 
-    if (Scrollbar* verticalScrollbar = scrollableArea()->verticalScrollbar()) {
+    if (Scrollbar* verticalScrollbar = getScrollableArea()->verticalScrollbar()) {
         verticalScrollbar->setNeedsPaintInvalidation(AllParts);
 
         ScrollbarPainter oldVerticalPainter = [m_scrollbarPainterController.get() verticalScrollerImp];
         ScrollbarPainter newVerticalPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:newStyle
                                                                                     controlSize:(NSControlSize)verticalScrollbar->controlSize()
                                                                                     horizontal:NO
                                                                                     replacingScrollerImp:oldVerticalPainter];
         [m_scrollbarPainterController.get() setVerticalScrollerImp:newVerticalPainter];
         macTheme->setNewPainterForScrollbar(*verticalScrollbar, newVerticalPainter);
 
         // The different scrollbar styles have different thicknesses, so we must re-set the
         // frameRect to the new thickness, and the re-layout below will ensure the position
         // and length are properly updated.
         int thickness = macTheme->scrollbarThickness(verticalScrollbar->controlSize());
         verticalScrollbar->setFrameRect(IntRect(0, 0, thickness, thickness));
     }
 
-    if (Scrollbar* horizontalScrollbar = scrollableArea()->horizontalScrollbar()) {
+    if (Scrollbar* horizontalScrollbar = getScrollableArea()->horizontalScrollbar()) {
         horizontalScrollbar->setNeedsPaintInvalidation(AllParts);
 
         ScrollbarPainter oldHorizontalPainter = [m_scrollbarPainterController.get() horizontalScrollerImp];
         ScrollbarPainter newHorizontalPainter = [NSClassFromString(@"NSScrollerImp") scrollerImpWithStyle:newStyle
                                                                                     controlSize:(NSControlSize)horizontalScrollbar->controlSize()
                                                                                     horizontal:YES
                                                                                     replacingScrollerImp:oldHorizontalPainter];
         [m_scrollbarPainterController.get() setHorizontalScrollerImp:newHorizontalPainter];
         macTheme->setNewPainterForScrollbar(*horizontalScrollbar, newHorizontalPainter);
 
         // The different scrollbar styles have different thicknesses, so we must re-set the
         // frameRect to the new thickness, and the re-layout below will ensure the position
         // and length are properly updated.
         int thickness = macTheme->scrollbarThickness(horizontalScrollbar->controlSize());
         horizontalScrollbar->setFrameRect(IntRect(0, 0, thickness, thickness));
     }
 
     // If m_needsScrollerStyleUpdate is true, then the page is restoring from the page cache, and
     // a relayout will happen on its own. Otherwise, we must initiate a re-layout ourselves.
     if (!m_needsScrollerStyleUpdate)
-        scrollableArea()->scrollbarStyleChanged();
+        getScrollableArea()->scrollbarStyleChanged();
 
     m_needsScrollerStyleUpdate = false;
 }
 
 void ScrollAnimatorMac::startScrollbarPaintTimer()
 {
     m_taskRunner->postDelayedTask(BLINK_FROM_HERE, m_initialScrollbarPaintTaskFactory->cancelAndCreate(), 0.1);
 }
 
 bool ScrollAnimatorMac::scrollbarPaintTimerIsActive() const
@@ skipping 37 matching lines @@
     if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())
         rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scrollerThumb);
 
     if (rectInViewCoordinates == m_visibleScrollerThumbRect)
         return;
 
     m_visibleScrollerThumbRect = rectInViewCoordinates;
 }
 
 } // namespace blink