Index: third_party/WebKit/Source/core/page/SpatialNavigation.cpp |
diff --git a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp |
index d329451a9c3e691c055bd49ed5a02226e34c07df..e1a42bc379a6157a275c5b03d5f2782827f74089 100644 |
--- a/third_party/WebKit/Source/core/page/SpatialNavigation.cpp |
+++ b/third_party/WebKit/Source/core/page/SpatialNavigation.cpp |
@@ -244,39 +244,29 @@ bool scrollInDirection(Node* container, WebFocusType type) { |
frameView ? frameView->getHostWindow() : nullptr); |
switch (type) { |
case WebFocusTypeLeft: |
- dx = -std::min(pixelsPerLineStep, |
- container->layoutBox()->scrollLeft().toInt()); |
+ dx = -pixelsPerLineStep; |
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()); |
+ dx = pixelsPerLineStep; |
break; |
case WebFocusTypeUp: |
- dy = -std::min(pixelsPerLineStep, |
- container->layoutBox()->scrollTop().toInt()); |
+ dy = -pixelsPerLineStep; |
break; |
case WebFocusTypeDown: |
ASSERT(container->layoutBox()->scrollHeight() - |
(container->layoutBox()->scrollTop() + |
container->layoutBox()->clientHeight())); |
- dy = std::min(pixelsPerLineStep, |
- (container->layoutBox()->scrollHeight() - |
- (container->layoutBox()->scrollTop() + |
- container->layoutBox()->clientHeight())) |
- .toInt()); |
+ dy = pixelsPerLineStep; |
break; |
default: |
ASSERT_NOT_REACHED(); |
return false; |
} |
- container->layoutBox()->scrollByRecursively(IntSize(dx, dy)); |
+ container->layoutBox()->scrollByRecursively(DoubleSize(dx, dy)); |
return true; |
} |