More explicit LayoutUnit conversions

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 176 matching lines @@
         return true;
 
     return !containerViewportRect.intersects(rect);
 }
 
 bool scrollInDirection(LocalFrame* frame, WebFocusType type)
 {
     ASSERT(frame);
 
     if (frame && canScrollInDirection(frame->document(), type)) {
-        LayoutUnit dx;
-        LayoutUnit dy;
+        int dx = 0;
+        int dy = 0;
         switch (type) {
         case WebFocusTypeLeft:
             dx = - ScrollableArea::pixelsPerLineStep();
             break;
         case WebFocusTypeRight:
             dx = ScrollableArea::pixelsPerLineStep();
             break;
         case WebFocusTypeUp:
             dy = - ScrollableArea::pixelsPerLineStep();
             break;
@@ skipping 14 matching lines @@
 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)) {
-        LayoutUnit dx;
-        LayoutUnit dy;
+        int dx = 0;
+        int dy = 0;
+        // TODO(leviw): Why are these values truncated (toInt) instead of rounding?

[eae, 2016/01/30 23:58:24]

These should probably be snapped based on the container.

[leviw_travelin_and_unemployed, 2016/01/31 00:33:13]

Yup! I'm avoiding for this round to keep from conflating these changes with
actual behavioral changes.

         switch (type) {
         case WebFocusTypeLeft:
-            dx = - std::min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollLeft());
+            dx = - std::min(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollLeft().toInt());
             break;
         case WebFocusTypeRight:
             ASSERT(container->layoutBox()->scrollWidth() > (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth()));
-            dx = std::min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollWidth() - (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth()));
+            dx = std::min(ScrollableArea::pixelsPerLineStep(),
+                (container->layoutBox()->scrollWidth() - (container->layoutBox()->scrollLeft() + container->layoutBox()->clientWidth())).toInt());
             break;
         case WebFocusTypeUp:
-            dy = - std::min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollTop());
+            dy = - std::min(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollTop().toInt());
             break;
         case WebFocusTypeDown:
             ASSERT(container->layoutBox()->scrollHeight() - (container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight()));
-            dy = std::min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->layoutBox()->scrollHeight() - (container->layoutBox()->scrollTop() + container->layoutBox()->clientHeight()));
+            dy = std::min(ScrollableArea::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;
     }
 
     return false;
 }
 
 static void deflateIfOverlapped(LayoutRect& a, LayoutRect& b)
 {
     if (!a.intersects(b) || a.contains(b) || b.contains(a))
         return;
 
-    LayoutUnit deflateFactor = -fudgeFactor();
+    LayoutUnit deflateFactor = LayoutUnit(-fudgeFactor());
 
     // Avoid negative width or height values.
     if ((a.width() + 2 * deflateFactor > 0) && (a.height() + 2 * deflateFactor > 0))
         a.inflate(deflateFactor);
 
     if ((b.width() + 2 * deflateFactor > 0) && (b.height() + 2 * deflateFactor > 0))
         b.inflate(deflateFactor);
 }
 
 bool isScrollableNode(const Node* node)
@@ skipping 346 matching lines @@
     LayoutRect rect = virtualRectForDirection(type, rectToAbsoluteCoordinates(area.document().frame(), area.computeRect(area.imageElement()->layoutObject())), 1);
     return rect;
 }
 
 HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
 {
     return candidate.isFrameOwnerElement() ? toHTMLFrameOwnerElement(candidate.visibleNode) : nullptr;
 };
 
 } // namespace blink