Remove more scrolling code from Sky

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 309 matching lines @@
     RenderLayer* layer;
     {
         TemporaryChange<bool> changeSchedulingEnabled(m_layoutSchedulingEnabled, false);
 
         m_nestedLayoutCount++;
 
         if (!inSubtreeLayout) {
             if (m_firstLayout) {
                 m_firstLayout = false;
                 m_firstLayoutCallbackPending = true;
-                m_lastViewportSize = layoutSize(IncludeScrollbars);
+                m_lastViewportSize = layoutSize();
             }
 
             m_size = LayoutSize(layoutSize().width(), layoutSize().height());
         }
 
         layer = rootForThisLayout->enclosingLayer();
 
         performLayout(rootForThisLayout, inSubtreeLayout);
 
         m_layoutSubtreeRoot = 0;
@@ skipping 40 matching lines @@
     return m_mediaType;
 }
 
 bool FrameView::shouldSetCursor() const
 {
     Page* page = frame().page();
     return page && page->visibilityState() != PageVisibilityStateHidden && page->focusController().isActive() && page->settings().deviceSupportsMouse();
 }
 
 // FIXME(sky): remove
-IntSize FrameView::layoutSize(IncludeScrollbarsInRect) const
+IntSize FrameView::layoutSize() const
 {
     return m_layoutSize;
 }
 
 void FrameView::setLayoutSize(const IntSize& size)
 {
     ASSERT(!layoutSizeFixedToFrameSize());
 
     setLayoutSizeInternal(size);
 }
@@ skipping 168 matching lines @@
             m_firstLayoutCallbackPending = false;
     }
 
     FontFaceSet::didLayout(*m_frame->document());
 
     sendResizeEventIfNeeded();
 }
 
 bool FrameView::wasViewportResized()
 {
-    return layoutSize(IncludeScrollbars) != m_lastViewportSize;
+    return layoutSize() != m_lastViewportSize;
 }
 
 void FrameView::sendResizeEventIfNeeded()
 {
     if (!wasViewportResized())
         return;
 
-    m_lastViewportSize = layoutSize(IncludeScrollbars);
+    m_lastViewportSize = layoutSize();
     m_frame->document()->enqueueResizeEvent();
 }
 
 void FrameView::postLayoutTimerFired(Timer<FrameView>*)
 {
     performPostLayoutTasks();
 }
 
-IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) const
+IntRect FrameView::windowClipRect() const
 {
     ASSERT(m_frame->view() == this);
 
     if (paintsEntireContents())
         return IntRect(IntPoint(), size());
 
     // Set our clip rect to be our contents.
-    IntRect clipRect = contentsToWindow(visibleContentRect(scrollbarInclusion));
+    IntRect clipRect = contentsToWindow(visibleContentRect());
     return clipRect;
 }
 
 bool FrameView::isActive() const
 {
     Page* page = frame().page();
     return page && page->focusController().isActive();
 }
 
 void FrameView::setVisibleContentScaleFactor(float visibleContentScaleFactor)
@@ skipping 231 matching lines @@
     totalObjects = 0;
 
     for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
         ++totalObjects;
         if (o->needsLayout())
             ++needsLayoutObjects;
     }
 }
 
 } // namespace blink