Hook up window.scrollTo and friends.

Source/core/frame/LocalDOMWindow.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1147 matching lines @@
     FrameView* view = frame()->view();
     if (!view)
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     frame()->document()->updateLayoutIgnorePendingStylesheets();
 
-    double viewportX = view->scrollPositionDouble().x();
+    double viewportX = view->scrollableArea()->scrollPositionDouble().x();
 
     if (host->settings().pinchVirtualViewportEnabled() && frame()->isMainFrame())
         viewportX += host->pinchViewport().location().x();
 
     return adjustScrollForAbsoluteZoom(viewportX, frame()->pageZoomFactor());
 }
 
 double LocalDOMWindow::scrollY() const
 {
     if (!frame())
         return 0;
 
     FrameView* view = frame()->view();
     if (!view)
         return 0;
 
     FrameHost* host = frame()->host();
     if (!host)
         return 0;
 
     frame()->document()->updateLayoutIgnorePendingStylesheets();
 
-    double viewportY = view->scrollPositionDouble().y();
+    double viewportY = view->scrollableArea()->scrollPositionDouble().y();
 
     if (host->settings().pinchVirtualViewportEnabled() && frame()->isMainFrame())
         viewportY += host->pinchViewport().location().y();
 
     return adjustScrollForAbsoluteZoom(viewportY, frame()->pageZoomFactor());
 }
 
 const AtomicString& LocalDOMWindow::name() const
 {
     if (!isCurrentlyDisplayedInFrame())
@@ skipping 91 matching lines @@
 static void scrollViewportTo(LocalFrame* frame, DoublePoint offset, ScrollBehavior scrollBehavior)
 {
     FrameView* view = frame->view();
     if (!view)
         return;
 
     FrameHost* host = frame->host();
     if (!host)
         return;
 
-    view->setScrollPosition(offset, scrollBehavior);
+    view->scrollableArea()->setScrollPosition(offset, scrollBehavior);
 
     if (host->settings().pinchVirtualViewportEnabled() && frame->isMainFrame()) {
         PinchViewport& pinchViewport = frame->host()->pinchViewport();
         DoubleSize excessDelta = offset - DoublePoint(pinchViewport.visibleRectInDocument().location());
         pinchViewport.move(FloatPoint(excessDelta.width(), excessDelta.height()));
     }
 }
 
 void LocalDOMWindow::scrollBy(double x, double y, ScrollBehavior scrollBehavior) const
 {
     if (!isCurrentlyDisplayedInFrame())
         return;
 
     document()->updateLayoutIgnorePendingStylesheets();
 
     FrameView* view = frame()->view();
     if (!view)
         return;
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     if (std::isnan(x) || std::isnan(y))
         return;
 
     DoublePoint currentOffset = host->settings().pinchVirtualViewportEnabled() && frame()->isMainFrame()
         ? DoublePoint(host->pinchViewport().visibleRectInDocument().location())
-        : view->scrollPositionDouble();
+        : view->scrollableArea()->scrollPositionDouble();
 
     DoubleSize scaledOffset(x * frame()->pageZoomFactor(), y * frame()->pageZoomFactor());
     scrollViewportTo(frame(), currentOffset + scaledOffset, scrollBehavior);
 }
 
 void LocalDOMWindow::scrollBy(const ScrollToOptions& scrollToOptions) const
 {
     double x = 0.0;
     double y = 0.0;
     if (scrollToOptions.hasLeft())
@@ skipping 32 matching lines @@
 
     FrameHost* host = frame()->host();
     if (!host)
         return;
 
     double scaledX = 0.0;
     double scaledY = 0.0;
 
     DoublePoint currentOffset = host->settings().pinchVirtualViewportEnabled() && frame()->isMainFrame()
         ? DoublePoint(host->pinchViewport().visibleRectInDocument().location())
-        : view->scrollPositionDouble();
+        : view->scrollableArea()->scrollPositionDouble();
     scaledX = currentOffset.x();
     scaledY = currentOffset.y();
 
     if (scrollToOptions.hasLeft()) {
         if (std::isnan(scrollToOptions.left()))
             return;
         scaledX = scrollToOptions.left() * frame()->pageZoomFactor();
     }
 
     if (scrollToOptions.hasTop()) {
@@ skipping 439 matching lines @@
     return m_frameObserver->frame();
 }
 
 v8::Handle<v8::Object> LocalDOMWindow::wrap(v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT_NOT_REACHED(); // LocalDOMWindow has [Custom=ToV8].
     return v8::Handle<v8::Object>();
 }
 
 } // namespace blink