Get rid of ScrollView.

sky/engine/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 916 matching lines @@
 
     // Reset the delegate to prevent notifications being sent as we're being
     // deleted.
     m_client = 0;
 
     deref();  // Balances ref() acquired in WebView::create
 }
 
 void WebViewImpl::willStartLiveResize()
 {
-    if (mainFrameImpl() && mainFrameImpl()->frameView())
-        mainFrameImpl()->frameView()->willStartLiveResize();
+    // FIXME(sky): Remove
 }
 
 WebSize WebViewImpl::size()
 {
     return m_size;
 }
 
 void WebViewImpl::resizePinchViewport(const WebSize& newSize)
 {
     if (!pinchVirtualViewportEnabled())
@@ skipping 31 matching lines @@
     if (!view)
         return;
 
     m_size = newSize;
     performResize();
     sendResizeEventAndRepaint();
 }
 
 void WebViewImpl::willEndLiveResize()
 {
-    if (mainFrameImpl() && mainFrameImpl()->frameView())
-        mainFrameImpl()->frameView()->willEndLiveResize();
+    // FIXME(sky): Remove
 }
 
 void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime)
 {
     TRACE_EVENT0("blink", "WebViewImpl::beginFrame");
 
     WebBeginFrameArgs validFrameTime(frameTime);
     if (!validFrameTime.lastFrameTimeMonotonic)
         validFrameTime.lastFrameTimeMonotonic = monotonicallyIncreasingTime();
 
@@ skipping 99 matching lines @@
 }
 
 void WebViewImpl::clearCompositedSelectionBounds()
 {
     if (m_layerTreeView)
         m_layerTreeView->clearSelection();
 }
 
 bool WebViewImpl::hasHorizontalScrollbar()
 {
-    return mainFrameImpl()->frameView()->horizontalScrollbar();
+    // FIXME(sky): Remove
+    return false;
 }
 
 bool WebViewImpl::hasVerticalScrollbar()
 {
-    return mainFrameImpl()->frameView()->verticalScrollbar();
+    // FIXME(sky): Remove
+    return false;
 }
 
 const WebInputEvent* WebViewImpl::m_currentInputEvent = 0;
 
 // FIXME: autogenerate this kind of code, and use it throughout Blink rather than
 // the one-offs for subsets of these values.
 static String inputTypeToName(WebInputEvent::Type type)
 {
     switch (type) {
     case WebInputEvent::MouseDown:
@@ skipping 808 matching lines @@
 
     layout();
     FontCachePurgePreventer fontCachePurgePreventer; // Required by minPreferredLogicalWidth().
     IntSize preferredMinimumSize(document->renderView()->minPreferredLogicalWidth(), document->documentElement()->scrollHeight());
     preferredMinimumSize.scale(zoomLevelToZoomFactor(zoomLevel()));
     return preferredMinimumSize;
 }
 
 void WebViewImpl::resetScrollAndScaleState()
 {
-    // TODO: This is done by the pinchViewport().reset() call below and can be removed when
-    // the new pinch path is the only one.
-    updateMainFrameScrollPosition(IntPoint(), true);
-    page()->frameHost().pinchViewport().reset();
-
-    // Clobber saved scales and scroll offsets.
-    if (FrameView* view = page()->mainFrame()->document()->view())
-        view->cacheCurrentScrollPosition();
+    // FIXME(sky): Remove
 }
 
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
     if (!page())
         return;
 
     LocalFrame* frame = page()->mainFrame();
     if (!frame)
         return;
@@ skipping 482 matching lines @@
         m_isAcceleratedCompositingActive = true;
         if (m_pageOverlays)
             m_pageOverlays->update();
         m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
         m_layerTreeView->setShowPaintRects(m_showPaintRects);
         m_layerTreeView->setShowDebugBorders(m_showDebugBorders);
         m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled);
         m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneckRects);
         m_layerTreeView->heuristicsForGpuRasterizationUpdated(m_matchesHeuristicsForGpuRasterization);
     }
-    if (page())
-        page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
 }
 
 void WebViewImpl::updateMainFrameScrollPosition(const IntPoint& scrollPosition, bool programmaticScroll)
 {
-    FrameView* frameView = page()->mainFrame()->view();
-    if (!frameView)
-        return;
-
-    if (frameView->scrollPosition() == scrollPosition)
-        return;
-
-    bool oldProgrammaticScroll = frameView->inProgrammaticScroll();
-    frameView->setInProgrammaticScroll(programmaticScroll);
-    frameView->notifyScrollPositionChanged(scrollPosition);
-    frameView->setInProgrammaticScroll(oldProgrammaticScroll);
+    // FIXME(sky): Remove
 }
 
 void WebViewImpl::applyScrollAndScale(const WebSize& scrollDelta, float pageScaleDelta)
 {
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return;
 
     // TODO(bokan): Old pinch path only - virtual viewport pinch scrolls are automatically updated via GraphicsLayer::DidScroll.
     // this should be removed once old pinch is removed.
         TRACE_EVENT_INSTANT2("blink", "WebViewImpl::applyScrollAndScale::scrollBy", "x", scrollDelta.width, "y", scrollDelta.height);
@@ skipping 77 matching lines @@
         m_layerTreeView->setVisible(visible);
     }
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     return true;
 }
 
 } // namespace blink