Remove ScrollableArea and Scrollbar

sky/engine/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 34 matching lines @@
 #include "sky/engine/core/page/FocusController.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 #include "sky/engine/core/rendering/RenderView.h"
 #include "sky/engine/core/rendering/style/RenderStyle.h"
 #include "sky/engine/platform/ScriptForbiddenScope.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/fonts/FontCache.h"
 #include "sky/engine/platform/geometry/FloatRect.h"
 #include "sky/engine/platform/graphics/GraphicsContext.h"
-#include "sky/engine/platform/scroll/ScrollAnimator.h"
-#include "sky/engine/platform/scroll/Scrollbar.h"
 #include "sky/engine/platform/text/TextStream.h"
 #include "sky/engine/wtf/CurrentTime.h"
 #include "sky/engine/wtf/TemporaryChange.h"
 
 namespace blink {
 
 double FrameView::s_currentFrameTimeStamp = 0.0;
 bool FrameView::s_inPaintContents = false;
 
 FrameView::FrameView(LocalFrame* frame)
@@ skipping 640 matching lines @@
     RenderObject* renderer = m_nodeToDraw ? m_nodeToDraw->renderer() : 0;
     RenderLayer* rootLayer = renderView->layer();
 
 #if ENABLE(ASSERT)
     renderView->assertSubtreeIsLaidOut();
     RenderObject::SetLayoutNeededForbiddenScope forbidSetNeedsLayout(*rootLayer->renderer());
 #endif
 
     rootLayer->paint(p, rect, renderer);
 
-    if (rootLayer->containsDirtyOverlayScrollbars())
-        rootLayer->paintOverlayScrollbars(p, rect, renderer);
-
     m_isPainting = false;
     m_lastPaintTime = currentTime();
 
     if (isTopLevelPainter) {
         // Everything that happens after paintContents completions is considered
         // to be part of the next frame.
         s_currentFrameTimeStamp = currentTime();
         s_inPaintContents = false;
     }
 }
@@ skipping 73 matching lines @@
 IntPoint FrameView::convertFromRenderer(const RenderObject& renderer, const IntPoint& rendererPoint) const
 {
     return roundedIntPoint(renderer.localToAbsolute(rendererPoint, UseTransforms));
 }
 
 IntPoint FrameView::convertToRenderer(const RenderObject& renderer, const IntPoint& viewPoint) const
 {
     return roundedIntPoint(renderer.absoluteToLocal(viewPoint, UseTransforms));
 }
 
-void FrameView::addScrollableArea(ScrollableArea* scrollableArea)
-{
-    ASSERT(scrollableArea);
-    if (!m_scrollableAreas)
-        m_scrollableAreas = adoptPtr(new ScrollableAreaSet);
-    m_scrollableAreas->add(scrollableArea);
-}
-
-void FrameView::removeScrollableArea(ScrollableArea* scrollableArea)
-{
-    if (!m_scrollableAreas)
-        return;
-    m_scrollableAreas->remove(scrollableArea);
-}
-
 bool FrameView::isVerticalDocument() const
 {
     // FIXME(sky): Remove
     return true;
 }
 
 bool FrameView::isFlippedDocument() const
 {
     // FIXME(sky): Remove
     return false;
@@ skipping 29 matching lines @@
     totalObjects = 0;
 
     for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
         ++totalObjects;
         if (o->needsLayout())
             ++needsLayoutObjects;
     }
 }
 
 } // namespace blink