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

third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
index b340b18f3654ca6fb8f8cf9c40a38979ff1be625..4bbbc82237df7626f7c07c232141ad5bf544cc0e 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -114,7 +114,7 @@ void ScrollAnimatorCompositorCoordinator::cancelAnimation()
         m_runState = RunState::WaitingToCancelOnCompositor;
 
         // Get serviced the next time compositor updates are allowed.
-        scrollableArea()->registerForAnimation();
+        getScrollableArea()->registerForAnimation();
     }
 }
 
@@ -138,7 +138,7 @@ void ScrollAnimatorCompositorCoordinator::takeoverCompositorAnimation()
         m_runState = RunState::RunningOnCompositorButNeedsTakeover;
 
         // Get serviced the next time compositor updates are allowed.
-        scrollableArea()->registerForAnimation();
+        getScrollableArea()->registerForAnimation();
     }
 }
 
@@ -165,8 +165,8 @@ void ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(
     case RunState::WaitingToCancelOnCompositor:
         m_runState = RunState::PostAnimationCleanup;
         // Get serviced the next time compositor updates are allowed.
-        if (scrollableArea())
-            scrollableArea()->registerForAnimation();
+        if (getScrollableArea())
+            getScrollableArea()->registerForAnimation();
         else
             resetAnimationState();
     }
@@ -177,8 +177,8 @@ bool ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded(
 {
     bool reattached = false;
     int compositorAnimationAttachedToLayerId = 0;
-    if (scrollableArea()->layerForScrolling())
-        compositorAnimationAttachedToLayerId = scrollableArea()->layerForScrolling()->platformLayer()->id();
+    if (getScrollableArea()->layerForScrolling())
+        compositorAnimationAttachedToLayerId = getScrollableArea()->layerForScrolling()->platformLayer()->id();
 
     if (compositorAnimationAttachedToLayerId != m_compositorAnimationAttachedToLayerId) {
         if (m_compositorPlayer && timeline) {
@@ -193,7 +193,7 @@ bool ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded(
                 ASSERT(!m_compositorPlayer->isLayerAttached());
                 timeline->playerAttached(*this);
                 m_compositorPlayer->attachLayer(
-                    scrollableArea()->layerForScrolling()->platformLayer());
+                    getScrollableArea()->layerForScrolling()->platformLayer());
                 reattached = true;
             }
             m_compositorAnimationAttachedToLayerId = compositorAnimationAttachedToLayerId;
@@ -229,13 +229,13 @@ CompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPlayer
 
 FloatPoint ScrollAnimatorCompositorCoordinator::compositorOffsetFromBlinkOffset(FloatPoint offset)
 {
-    offset.moveBy(scrollableArea()->scrollOrigin());
+    offset.moveBy(getScrollableArea()->scrollOrigin());
     return offset;
 }
 
 FloatPoint ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(FloatPoint offset)
 {
-    offset.moveBy(-scrollableArea()->scrollOrigin());
+    offset.moveBy(-getScrollableArea()->scrollOrigin());
     return offset;
 }