Move convertViewportToWindow and convertWindowToViewport from

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

Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
index a8e8fb8da0ee04579b345ad2fa193cc11212fde4..02abc5a2ecf0b0b7ebf637c92664304e87bf8685 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -59,11 +59,11 @@ struct SameSizeAsScrollableArea {
 
 static_assert(sizeof(ScrollableArea) == sizeof(SameSizeAsScrollableArea), "ScrollableArea should stay small");
 
-int ScrollableArea::pixelsPerLineStep(HostWindow* host)
+int ScrollableArea::pixelsPerLineStep(HostWindow* host, Widget* widget)
 {
     if (!host)
         return kPixelsPerLineStep;
-    return host->windowToViewportScalar(kPixelsPerLineStep);
+    return host->windowToViewportScalar(kPixelsPerLineStep, widget);
 }
 
 float ScrollableArea::minFractionToStepWhenPaging()
@@ -134,7 +134,7 @@ ScrollbarOrientation ScrollableArea::scrollbarOrientationFromDirection(ScrollDir
     return (direction == ScrollUp  || direction == ScrollDown) ? VerticalScrollbar : HorizontalScrollbar;
 }
 
-float ScrollableArea::scrollStep(ScrollGranularity granularity, ScrollbarOrientation orientation) const
+float ScrollableArea::scrollStep(ScrollGranularity granularity, ScrollbarOrientation orientation)

[dcheng, 2016/09/08 05:25:47]

Argh const-correctness.

Let's just mark getWidget() const =(

[lfg, 2016/09/08 21:40:43]

I tried that before, but FrameView::getWidget returns "this", so it can't be
const.

 {
     switch (granularity) {
     case ScrollByLine:
@@ -567,9 +567,9 @@ DoublePoint ScrollableArea::clampScrollPosition(const DoublePoint& scrollPositio
     return scrollPosition.shrunkTo(maximumScrollPositionDouble()).expandedTo(minimumScrollPositionDouble());
 }
 
-int ScrollableArea::lineStep(ScrollbarOrientation) const
+int ScrollableArea::lineStep(ScrollbarOrientation)
 {
-    return pixelsPerLineStep(getHostWindow());
+    return pixelsPerLineStep(getHostWindow(), getWidget());
 }
 
 int ScrollableArea::pageStep(ScrollbarOrientation orientation) const