Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/platform/scroll/ScrollableArea.h

Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
index d56eff27373447cc61e9f614342813ef88d9a522..898ce914d69fab1e1e8a3de9b4ecf38c7819fe7d 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h
@@ -61,7 +61,7 @@ enum IncludeScrollbarsInRect {
 class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin {
     WTF_MAKE_NONCOPYABLE(ScrollableArea);
 public:
-    static int pixelsPerLineStep(HostWindow*);
+    static int pixelsPerLineStep(HostWindow*, Widget*);
     static float minFractionToStepWhenPaging();
     static int maxOverlapBetweenPages();
 
@@ -295,7 +295,7 @@ protected:
     ScrollableArea();
 
     ScrollbarOrientation scrollbarOrientationFromDirection(ScrollDirectionPhysical) const;
-    float scrollStep(ScrollGranularity, ScrollbarOrientation) const;
+    float scrollStep(ScrollGranularity, ScrollbarOrientation);
 
     void setScrollOrigin(const IntPoint&);
     void resetScrollOriginChanged() { m_scrollOriginChanged = false; }
@@ -321,7 +321,7 @@ private:
     // This function should be overriden by subclasses to perform the actual scroll of the content.
     virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0;
 
-    virtual int lineStep(ScrollbarOrientation) const;
+    virtual int lineStep(ScrollbarOrientation);
     virtual int pageStep(ScrollbarOrientation) const;
     virtual int documentStep(ScrollbarOrientation) const;
     virtual float pixelStep(ScrollbarOrientation) const;