Remove more frame-level scrolling machinery.

sky/engine/core/frame/FrameView.cpp

Index: sky/engine/core/frame/FrameView.cpp
diff --git a/sky/engine/core/frame/FrameView.cpp b/sky/engine/core/frame/FrameView.cpp
index 853fd3577f0e9efca135a7c8f38f9c1bc896592b..40c0ab06a62d8dae7d777c544dd310c8cded41a0 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -223,16 +223,6 @@ RenderView* FrameView::renderView() const
     return frame().contentRenderer();
 }
 
-void FrameView::setCanHaveScrollbars(bool canHaveScrollbars)
-{
-    // FIXME(sky): Remove
-}
-
-void FrameView::setContentsSize(const IntSize&)
-{
-    // FIXME(sky): Remove
-}
-
 IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) const
 {
     FloatSize scaledSize = unscaledVisibleContentSize();
@@ -247,19 +237,6 @@ IntPoint FrameView::clampOffsetAtScale(const IntPoint& offset, float scale) cons
     return clampedOffset;
 }
 
-void FrameView::adjustViewSize()
-{
-    RenderView* renderView = this->renderView();
-    if (!renderView)
-        return;
-
-    ASSERT(m_frame->view() == this);
-
-    const IntRect rect = renderView->documentRect();
-    const IntSize& size = rect.size();
-    setContentsSize(size);
-}
-
 void FrameView::applyOverflowToViewportAndSetRenderer(RenderObject* o, ScrollbarMode& hMode, ScrollbarMode& vMode)
 {
     // Handle the overflow:hidden/scroll case for the body/html elements.  WinIE treats
@@ -340,15 +317,6 @@ void FrameView::recalcOverflowAfterStyleChange()
         return;
 
     renderView->recalcOverflowAfterStyleChange();
-
-    IntRect documentRect = renderView->documentRect();
-    if (size() == documentRect.size())
-        return;
-
-    if (needsLayout())
-        return;
-
-    adjustViewSize();
 }
 
 bool FrameView::usesCompositedScrolling() const
@@ -585,9 +553,6 @@ void FrameView::layout(bool allowSubtree)
             container->setMayNeedPaintInvalidation(true);
     } // Reset m_layoutSchedulingEnabled to its previous value.
 
-    if (!inSubtreeLayout)
-        adjustViewSize();
-
     layer->updateLayerPositionsAfterLayout();
 
     if (m_doFullPaintInvalidation)
@@ -947,24 +912,12 @@ void FrameView::scrollElementToRect(Element* element, const IntRect& rect)
         bounds.x() - centeringOffsetX - targetRect.x(),
         bounds.y() - centeringOffsetY - targetRect.y());
 
-    setScrollPosition(targetOffset);
-
     if (pinchVirtualViewportEnabled) {
         IntPoint remainder = IntPoint(targetOffset - scrollPosition());
         m_frame->page()->frameHost().pinchViewport().move(remainder);
     }
 }
 
-void FrameView::setScrollPosition(const IntPoint& scrollPoint, ScrollBehavior scrollBehavior)
-{
-    // FIXME(sky): Remove
-}
-
-void FrameView::setScrollPositionNonProgrammatically(const IntPoint&)
-{
-    // FIXME(sky): Remove
-}
-
 // FIXME(sky): remove
 IntSize FrameView::layoutSize(IncludeScrollbarsInRect) const
 {
@@ -1065,12 +1018,6 @@ void FrameView::updateCompositedSelectionBoundsIfNeeded()
     // TODO(jdduke): Compute and route selection bounds through ChromeClient.
 }
 
-bool FrameView::isRubberBandInProgress() const
-{
-    // FIXME(sky): Remove
-    return false;
-}
-
 HostWindow* FrameView::hostWindow() const
 {
     Page* page = frame().page();