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 1c86b0b55ec03cddfd35499eabf6adb3e40abdd0..99e46b47cdb6e5009098e2adfe048d706ea58743 100644
--- a/sky/engine/core/frame/FrameView.cpp
+++ b/sky/engine/core/frame/FrameView.cpp
@@ -79,8 +79,6 @@ FrameView::FrameView(LocalFrame* frame)
     , m_mediaType("screen")
     , m_overflowStatusDirty(true)
     , m_viewportRenderer(0)
-    , m_wasScrolledByUser(false)
-    , m_inProgrammaticScroll(false)
     , m_isTrackingPaintInvalidations(false)
     , m_hasSoftwareFilters(false)
     , m_visibleContentScaleFactor(1)
@@ -128,7 +126,6 @@ void FrameView::reset()
     m_postLayoutTasksTimer.stop();
     m_firstLayout = true;
     m_firstLayoutCallbackPending = false;
-    m_wasScrolledByUser = false;
     m_lastViewportSize = IntSize();
     m_lastZoomFactor = 1.0f;
     m_isTrackingPaintInvalidations = false;
@@ -349,9 +346,6 @@ void FrameView::layout(bool allowSubtree)
     // Protect the view from being deleted during layout (in recalcStyle)
     RefPtr<FrameView> protector(this);
 
-    // Every scroll that happens during layout is programmatic.
-    TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
-
     m_hasPendingLayout = false;
     DocumentLifecycle::Scope lifecycleScope(lifecycle(), DocumentLifecycle::LayoutClean);
 
@@ -898,18 +892,6 @@ Color FrameView::documentBackgroundColor() const
     return result;
 }
 
-bool FrameView::wasScrolledByUser() const
-{
-    return m_wasScrolledByUser;
-}
-
-void FrameView::setWasScrolledByUser(bool wasScrolledByUser)
-{
-    if (m_inProgrammaticScroll)
-        return;
-    m_wasScrolledByUser = wasScrolledByUser;
-}
-
 void FrameView::paintContents(GraphicsContext* p, const IntRect& rect)
 {
     Document* document = m_frame->document();
@@ -1085,26 +1067,6 @@ IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoi
     return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
 }
 
-IntRect FrameView::convertToContainingView(const IntRect& localRect) const
-{
-    return localRect;
-}
-
-IntRect FrameView::convertFromContainingView(const IntRect& parentRect) const
-{
-    return parentRect;
-}
-
-IntPoint FrameView::convertToContainingView(const IntPoint& localPoint) const
-{
-    return localPoint;
-}
-
-IntPoint FrameView::convertFromContainingView(const IntPoint& parentPoint) const
-{
-    return parentPoint;
-}
-
 void FrameView::setTracksPaintInvalidations(bool trackPaintInvalidations)
 {
     if (trackPaintInvalidations == m_isTrackingPaintInvalidations)