Remove some more frame-level scrolling machinery.

sky/engine/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 56 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/Chrome.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/page/WindowFocusAllowedIndicator.h"
-#include "core/page/scrolling/ScrollingCoordinator.h"
+#include "core/rendering/style/RenderStyle.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/PlatformScreen.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/Platform.h"
 #include "wtf/MainThread.h"
@@ skipping 478 matching lines @@
     if (!m_frame)
         return 0;
 
     FrameHost* host = m_frame->host();
     if (!host)
         return 0;
 
     return static_cast<int>(host->chrome().windowRect().y());
 }
 
-int LocalDOMWindow::scrollX() const
-{
-    if (!m_frame)
-        return 0;
-
-    FrameView* view = m_frame->view();
-    if (!view)
-        return 0;
-
-    m_frame->document()->updateLayoutIgnorePendingStylesheets();
-
-    return adjustForAbsoluteZoom(view->scrollX(), m_frame->pageZoomFactor());
-}
-
-int LocalDOMWindow::scrollY() const
-{
-    if (!m_frame)
-        return 0;
-
-    FrameView* view = m_frame->view();
-    if (!view)
-        return 0;
-
-    m_frame->document()->updateLayoutIgnorePendingStylesheets();
-
-    return adjustForAbsoluteZoom(view->scrollY(), m_frame->pageZoomFactor());
-}
-
 LocalDOMWindow* LocalDOMWindow::window() const
 {
     if (!m_frame)
         return 0;
 
     return m_frame->domWindow();
 }
 
 Document* LocalDOMWindow::document() const
 {
@@ skipping 31 matching lines @@
 }
 
 double LocalDOMWindow::devicePixelRatio() const
 {
     if (!m_frame)
         return 0.0;
 
     return m_frame->devicePixelRatio();
 }
 
-static bool scrollBehaviorFromScrollOptions(const Dictionary& scrollOptions, ScrollBehavior& scrollBehavior, ExceptionState& exceptionState)
-{
-    String scrollBehaviorString;
-    if (!DictionaryHelper::get(scrollOptions, "behavior", scrollBehaviorString)) {
-        scrollBehavior = ScrollBehaviorAuto;
-        return true;
-    }
-
-    if (ScrollableArea::scrollBehaviorFromString(scrollBehaviorString, scrollBehavior))
-        return true;
-
-    exceptionState.throwTypeError("The ScrollBehavior provided is invalid.");
-    return false;
-}
-
-void LocalDOMWindow::scrollBy(int x, int y, ScrollBehavior scrollBehavior) const
-{
-    // FIXME(sky): Remove
-}
-
-void LocalDOMWindow::scrollBy(int x, int y, const Dictionary& scrollOptions, ExceptionState &exceptionState) const
-{
-    ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
-    if (!scrollBehaviorFromScrollOptions(scrollOptions, scrollBehavior, exceptionState))
-        return;
-    scrollBy(x, y, scrollBehavior);
-}
-
-void LocalDOMWindow::scrollTo(int x, int y, ScrollBehavior scrollBehavior) const
-{
-    document()->updateLayoutIgnorePendingStylesheets();
-
-    RefPtr<FrameView> view = m_frame->view();
-    if (!view)
-        return;
-
-    IntPoint layoutPos(x * m_frame->pageZoomFactor(), y * m_frame->pageZoomFactor());
-    view->setScrollPosition(layoutPos, scrollBehavior);
-}
-
-void LocalDOMWindow::scrollTo(int x, int y, const Dictionary& scrollOptions, ExceptionState& exceptionState) const
-{
-    ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
-    if (!scrollBehaviorFromScrollOptions(scrollOptions, scrollBehavior, exceptionState))
-        return;
-    scrollTo(x, y, scrollBehavior);
-}
-
 void LocalDOMWindow::moveBy(float x, float y) const
 {
     if (!m_frame)
         return;
 
     FrameHost* host = m_frame->host();
     if (!host)
         return;
 
     FloatRect windowRect = host->chrome().windowRect();
@@ skipping 189 matching lines @@
     visitor->trace(m_location);
     visitor->trace(m_media);
     visitor->trace(m_css);
     visitor->trace(m_eventQueue);
     WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
     LifecycleContext<LocalDOMWindow>::trace(visitor);
 }
 
 } // namespace blink