Revert of Refactor ScrollableArea::setScrollPosition.

third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp

 /*
  * Copyright (C) 2012 Google 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 166 matching lines @@
   void scrollControlWasSetNeedsPaintInvalidation() override {}
   bool userInputScrollable(ScrollbarOrientation) const override { return true; }
   bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
   int pageStep(ScrollbarOrientation) const override { return 0; }
   IntPoint minimumScrollPosition() const override { return IntPoint(); }
   IntPoint maximumScrollPosition() const override {
     return IntPoint(contentsSize().width() - visibleWidth(),
                     contentsSize().height() - visibleHeight());
   }
 
-  void setScrollOffset(const DoublePoint& offset, ScrollType) override {
-    m_scrollPosition = offset;
+  void setScrollOffset(const DoublePoint& scrollOffset, ScrollType) override {
+    m_scrollPosition = scrollOffset;
   }
   DoublePoint scrollPositionDouble() const override { return m_scrollPosition; }
   IntPoint scrollPosition() const override {
     return flooredIntPoint(m_scrollPosition);
   }
 
   DEFINE_INLINE_VIRTUAL_TRACE() { ScrollableArea::trace(visitor); }
 
  private:
   DoublePoint m_scrollPosition;
 };
 
 TEST_F(GraphicsLayerTest, applyScrollToScrollableArea) {
   FakeScrollableArea* scrollableArea = FakeScrollableArea::create();
   m_graphicsLayer->setScrollableArea(scrollableArea, false);
 
   WebDoublePoint scrollPosition(7, 9);
   m_platformLayer->setScrollPositionDouble(scrollPosition);
   m_graphicsLayer->didScroll();
 
   EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea->scrollPositionDouble().x());
   EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea->scrollPositionDouble().y());
 }
 
 }  // namespace blink