ScrollableArea::pixelsPerLine should return viewport pixels in use-zoom-for-dsf mode

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 141 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->hostWindow());
     switch (type) {
     case WebFocusTypeLeft:
-        containerViewportRect.setX(containerViewportRect.x() - ScrollableArea::pixelsPerLineStep());
-        containerViewportRect.setWidth(containerViewportRect.width() + ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setX(containerViewportRect.x() - pixelsPerLineStep);
+        containerViewportRect.setWidth(containerViewportRect.width() + pixelsPerLineStep);
         break;
     case WebFocusTypeRight:
-        containerViewportRect.setWidth(containerViewportRect.width() + ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setWidth(containerViewportRect.width() + pixelsPerLineStep);
         break;
     case WebFocusTypeUp:
-        containerViewportRect.setY(containerViewportRect.y() - ScrollableArea::pixelsPerLineStep());
-        containerViewportRect.setHeight(containerViewportRect.height() + ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setY(containerViewportRect.y() - pixelsPerLineStep);
+        containerViewportRect.setHeight(containerViewportRect.height() + pixelsPerLineStep);
         break;
     case WebFocusTypeDown:
-        containerViewportRect.setHeight(containerViewportRect.height() + ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setHeight(containerViewportRect.height() + pixelsPerLineStep);
         break;
     default:
         break;
     }
 
     LayoutObject* layoutObject = node->layoutObject();
     if (!layoutObject)
         return true;
 
     LayoutRect rect(layoutObject->absoluteClippedOverflowRect());
     if (rect.isEmpty())
         return true;
 
     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()->hostWindow());
         switch (type) {
         case WebFocusTypeLeft:
-            dx = - ScrollableArea::pixelsPerLineStep();
+            dx = - pixelsPerLineStep;
             break;
         case WebFocusTypeRight:
-            dx = ScrollableArea::pixelsPerLineStep();
+            dx = pixelsPerLineStep;
             break;
         case WebFocusTypeUp:
-            dy = - ScrollableArea::pixelsPerLineStep();
+            dy = - pixelsPerLineStep;
             break;
         case WebFocusTypeDown:
-            dy = ScrollableArea::pixelsPerLineStep();
+            dy = pixelsPerLineStep;
             break;
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
 
         frame->view()->scrollBy(IntSize(dx, dy), UserScroll);
         return true;
     }
     return false;
 }
 
 bool scrollInDirection(Node* container, WebFocusType type)
 {
     ASSERT(container);
     if (container->isDocumentNode())
         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->hostWindow() : nullptr);
         switch (type) {
         case WebFocusTypeLeft:
-            dx = - std::min(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollLeft().toInt());
+            dx = - std::min(pixelsPerLineStep, container->layoutBox()->scrollLeft().toInt());
             break;
         case WebFocusTypeRight:
             ASSERT(container->layoutBox()->scrollWidth() > (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth()));
-            dx = std::min(ScrollableArea::pixelsPerLineStep(),
+            dx = std::min(pixelsPerLineStep,
                 (container->layoutBox()->scrollWidth() - (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth())).toInt());
             break;
         case WebFocusTypeUp:
-            dy = - std::min(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollTop().toInt());
+            dy = - std::min(pixelsPerLineStep, container->layoutBox()->scrollTop().toInt());
             break;
         case WebFocusTypeDown:
             ASSERT(container->layoutBox()->scrollHeight() - (container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight()));
-            dy = std::min(ScrollableArea::pixelsPerLineStep(),
+            dy = std::min(pixelsPerLineStep,
                 (container->layoutBox()->scrollHeight() - (container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight())).toInt());
             break;
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
 
         container->layoutBox()->scrollByRecursively(IntSize(dx, dy));
         return true;
     }
@@ skipping 366 matching lines @@
     LayoutRect rect = virtualRectForDirection(type, rectToAbsoluteCoordinates(area.document().frame(), area.computeRect(area.imageElement()->layoutObject())), LayoutUnit(1));
     return rect;
 }
 
 HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
 {
     return candidate.isFrameOwnerElement() ? toHTMLFrameOwnerElement(candidate.visibleNode) : nullptr;
 };
 
 } // namespace blink