Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/core/page/SpatialNavigation.cpp

 /*
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Antonio Gomes <tonikitoo@webkit.org>
  *
  * 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
@@ skipping 142 matching lines @@
     if (!frameView)
         return true;
 
     ASSERT(!frameView->needsLayout());
 
     LayoutRect containerViewportRect(frameView->visibleContentRect());
     // We want to select a node if it is currently off screen, but will be
     // exposed after we scroll. Adjust the viewport to post-scrolling position.
     // If the container has overflow:hidden, we cannot scroll, so we do not pass direction
     // and we do not adjust for scrolling.
-    int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frameView->getHostWindow());
+    int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frameView->getHostWindow(), frameView);
     switch (type) {
     case WebFocusTypeLeft:
         containerViewportRect.setX(containerViewportRect.x() - pixelsPerLineStep);
         containerViewportRect.setWidth(containerViewportRect.width() + pixelsPerLineStep);
         break;
     case WebFocusTypeRight:
         containerViewportRect.setWidth(containerViewportRect.width() + pixelsPerLineStep);
         break;
     case WebFocusTypeUp:
         containerViewportRect.setY(containerViewportRect.y() - pixelsPerLineStep);
@@ skipping 17 matching lines @@
     return !containerViewportRect.intersects(rect);
 }
 
 bool scrollInDirection(LocalFrame* frame, WebFocusType type)
 {
     ASSERT(frame);
 
     if (frame && canScrollInDirection(frame->document(), type)) {
         int dx = 0;
         int dy = 0;
-        int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frame->view()->getHostWindow());
+        int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frame->view()->getHostWindow(), frame->view());
         switch (type) {
         case WebFocusTypeLeft:
             dx = - pixelsPerLineStep;
             break;
         case WebFocusTypeRight:
             dx = pixelsPerLineStep;
             break;
         case WebFocusTypeUp:
             dy = - pixelsPerLineStep;
             break;
@@ skipping 18 matching lines @@
         return scrollInDirection(toDocument(container)->frame(), type);
 
     if (!container->layoutBox())
         return false;
 
     if (canScrollInDirection(container, type)) {
         int dx = 0;
         int dy = 0;
         // TODO(leviw): Why are these values truncated (toInt) instead of rounding?
         FrameView* frameView = container->document().view();
-        int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frameView ? frameView->getHostWindow() : nullptr);
+        int pixelsPerLineStep = ScrollableArea::pixelsPerLineStep(frameView ? frameView->getHostWindow() : nullptr, frameView);
         switch (type) {
         case WebFocusTypeLeft:
             dx = - std::min(pixelsPerLineStep, container->layoutBox()->scrollLeft().toInt());
             break;
         case WebFocusTypeRight:
             ASSERT(container->layoutBox()->scrollWidth() > (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth()));
             dx = std::min(pixelsPerLineStep,
                 (container->layoutBox()->scrollWidth() - (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth())).toInt());
             break;
         case WebFocusTypeUp:
@@ skipping 381 matching lines @@
     LayoutRect rect = virtualRectForDirection(type, rectToAbsoluteCoordinates(area.document().frame(), area.computeAbsoluteRect(area.imageElement()->layoutObject())), LayoutUnit(1));
     return rect;
 }
 
 HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
 {
     return candidate.isFrameOwnerElement() ? toHTMLFrameOwnerElement(candidate.visibleNode) : nullptr;
 };
 
 } // namespace blink