Allow objects without scrollbars to be scrollable

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 287 matching lines @@
 
     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.
     switch (direction) {
     case FocusDirectionLeft:
-        containerViewportRect.setX(containerViewportRect.x() - Scrollbar::pixelsPerLineStep());
-        containerViewportRect.setWidth(containerViewportRect.width() + Scrollbar::pixelsPerLineStep());
+        containerViewportRect.setX(containerViewportRect.x() - ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setWidth(containerViewportRect.width() + ScrollableArea::pixelsPerLineStep());
         break;
     case FocusDirectionRight:
-        containerViewportRect.setWidth(containerViewportRect.width() + Scrollbar::pixelsPerLineStep());
+        containerViewportRect.setWidth(containerViewportRect.width() + ScrollableArea::pixelsPerLineStep());
         break;
     case FocusDirectionUp:
-        containerViewportRect.setY(containerViewportRect.y() - Scrollbar::pixelsPerLineStep());
-        containerViewportRect.setHeight(containerViewportRect.height() + Scrollbar::pixelsPerLineStep());
+        containerViewportRect.setY(containerViewportRect.y() - ScrollableArea::pixelsPerLineStep());
+        containerViewportRect.setHeight(containerViewportRect.height() + ScrollableArea::pixelsPerLineStep());
         break;
     case FocusDirectionDown:
-        containerViewportRect.setHeight(containerViewportRect.height() + Scrollbar::pixelsPerLineStep());
+        containerViewportRect.setHeight(containerViewportRect.height() + ScrollableArea::pixelsPerLineStep());
         break;
     default:
         break;
     }
 
     RenderObject* render = node->renderer();
     if (!render)
         return true;
 
     LayoutRect rect(render->absoluteClippedOverflowRect());
     if (rect.isEmpty())
         return true;
 
     return !containerViewportRect.intersects(rect);
 }
 
 bool scrollInDirection(Frame* frame, FocusDirection direction)
 {
     ASSERT(frame);
 
     if (frame && canScrollInDirection(frame->document(), direction)) {
         LayoutUnit dx = 0;
         LayoutUnit dy = 0;
         switch (direction) {
         case FocusDirectionLeft:
-            dx = - Scrollbar::pixelsPerLineStep();
+            dx = - ScrollableArea::pixelsPerLineStep();
             break;
         case FocusDirectionRight:
-            dx = Scrollbar::pixelsPerLineStep();
+            dx = ScrollableArea::pixelsPerLineStep();
             break;
         case FocusDirectionUp:
-            dy = - Scrollbar::pixelsPerLineStep();
+            dy = - ScrollableArea::pixelsPerLineStep();
             break;
         case FocusDirectionDown:
-            dy = Scrollbar::pixelsPerLineStep();
+            dy = ScrollableArea::pixelsPerLineStep();
             break;
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
 
         frame->view()->scrollBy(IntSize(dx, dy));
         return true;
     }
     return false;
 }
 
 bool scrollInDirection(Node* container, FocusDirection direction)
 {
     ASSERT(container);
     if (container->isDocumentNode())
         return scrollInDirection(toDocument(container)->frame(), direction);
 
     if (!container->renderBox())
         return false;
 
     if (canScrollInDirection(container, direction)) {
         LayoutUnit dx = 0;
         LayoutUnit dy = 0;
         switch (direction) {
         case FocusDirectionLeft:
-            dx = - min<LayoutUnit>(Scrollbar::pixelsPerLineStep(), container->renderBox()->scrollLeft());
+            dx = - min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->renderBox()->scrollLeft());
             break;
         case FocusDirectionRight:
             ASSERT(container->renderBox()->scrollWidth() > (container->renderBox()->scrollLeft() + container->renderBox()->clientWidth()));
-            dx = min<LayoutUnit>(Scrollbar::pixelsPerLineStep(), container->renderBox()->scrollWidth() - (container->renderBox()->scrollLeft() + container->renderBox()->clientWidth()));
+            dx = min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->renderBox()->scrollWidth() - (container->renderBox()->scrollLeft() + container->renderBox()->clientWidth()));
             break;
         case FocusDirectionUp:
-            dy = - min<LayoutUnit>(Scrollbar::pixelsPerLineStep(), container->renderBox()->scrollTop());
+            dy = - min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->renderBox()->scrollTop());
             break;
         case FocusDirectionDown:
             ASSERT(container->renderBox()->scrollHeight() - (container->renderBox()->scrollTop() + container->renderBox()->clientHeight()));
-            dy = min<LayoutUnit>(Scrollbar::pixelsPerLineStep(), container->renderBox()->scrollHeight() - (container->renderBox()->scrollTop() + container->renderBox()->clientHeight()));
+            dy = min<LayoutUnit>(ScrollableArea::pixelsPerLineStep(), container->renderBox()->scrollHeight() - (container->renderBox()->scrollTop() + container->renderBox()->clientHeight()));
             break;
         default:
             ASSERT_NOT_REACHED();
             return false;
         }
 
         container->renderBox()->enclosingLayer()->scrollByRecursively(IntSize(dx, dy));
         return true;
     }
 
@@ skipping 327 matching lines @@
     LayoutRect rect = virtualRectForDirection(direction, rectToAbsoluteCoordinates(area->document()->frame(), area->computeRect(area->imageElement()->renderer())), 1);
     return rect;
 }
 
 HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
 {
     return candidate.isFrameOwnerElement() ? static_cast<HTMLFrameOwnerElement*>(candidate.visibleNode) : 0;
 };
 
 } // namespace WebCore