Remove more scrolling code from Sky

sky/engine/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 14 matching lines @@
 #ifndef SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_
 #define SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_
 
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/core/rendering/PaintPhase.h"
 #include "sky/engine/platform/HostWindow.h"
 #include "sky/engine/platform/Timer.h"
 #include "sky/engine/platform/Widget.h"
 #include "sky/engine/platform/geometry/LayoutRect.h"
 #include "sky/engine/platform/graphics/Color.h"
-#include "sky/engine/platform/scroll/ScrollTypes.h"
 #include "sky/engine/wtf/Forward.h"
 #include "sky/engine/wtf/HashSet.h"
 #include "sky/engine/wtf/OwnPtr.h"
 #include "sky/engine/wtf/text/WTFString.h"
 
 namespace blink {
 
 class DocumentLifecycle;
 class Cursor;
 class Element;
@@ skipping 37 matching lines @@
 
     RenderObject* layoutRoot(bool onlyDuringLayout = false) const;
     void clearLayoutSubtreeRoot() { m_layoutSubtreeRoot = 0; }
     int layoutCount() const { return m_layoutCount; }
 
     bool needsLayout() const;
     void setNeedsLayout();
 
     // Methods for getting/setting the size Blink should use to layout the contents.
     // FIXME(sky): Remove the scrollbars argument now that FrameView doesn't scroll.
-    IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
+    IntSize layoutSize() const;
     void setLayoutSize(const IntSize&);
 
     // If this is set to false, the layout size will need to be explicitly set by the owner.
     // E.g. WebViewImpl sets its mainFrame's layout size manually
     void setLayoutSizeFixedToFrameSize(bool isFixed) { m_layoutSizeFixedToFrameSize = isFixed; }
     bool layoutSizeFixedToFrameSize() { return m_layoutSizeFixedToFrameSize; }
 
     void recalcOverflowAfterStyleChange();
 
     bool isEnclosedInCompositingLayer() const;
 
     void prepareForDetach();
 
     void clear();
 
     bool isTransparent() const;
     void setTransparent(bool isTransparent);
 
     Color baseBackgroundColor() const;
     void setBaseBackgroundColor(const Color&);
     void updateBackgroundRecursively(const Color&, bool);
 
-    IntRect windowClipRect(IncludeScrollbarsInRect = ExcludeScrollbars) const;
+    IntRect windowClipRect() const;
 
     float visibleContentScaleFactor() const { return m_visibleContentScaleFactor; }
     void setVisibleContentScaleFactor(float);
 
     float inputEventsScaleFactor() const;
     IntSize inputEventsOffsetForEmulation() const;
     void setInputEventsTransformForEmulation(const IntSize&, float);
 
     AtomicString mediaType() const;
     void setMediaType(const AtomicString&);
@@ skipping 38 matching lines @@
     // passed around the FrameView layout methods can be true while this returns
     // false.
     bool isSubtreeLayout() const { return !!m_layoutSubtreeRoot; }
 
     // FIXME(sky): remove
     IntPoint windowToContents(const IntPoint& windowPoint) const { return windowPoint; }
     IntPoint contentsToWindow(const IntPoint& contentsPoint) const { return contentsPoint; }
     IntRect windowToContents(const IntRect& windowRect) const { return windowRect; }
     IntRect contentsToWindow(const IntRect& contentsRect) const { return contentsRect; }
 
-    IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollbars) const { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); }
-    IntSize unscaledVisibleContentSize(IncludeScrollbarsInRect = ExcludeScrollbars) const { return frameRect().size(); }
+    IntRect visibleContentRect() const { return IntRect(IntPoint(), expandedIntSize(frameRect().size())); }
+    IntSize unscaledVisibleContentSize() const { return frameRect().size(); }
     // FIXME(sky): Not clear what values these should return. This is just what they happen to be
     // returning today.
     bool paintsEntireContents() const { return false; }
 
     // For inspector reporting:
     void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial);
 
 protected:
     bool isVerticalDocument() const;
     bool isFlippedDocument() const;
@@ skipping 67 matching lines @@
     bool m_layoutSizeFixedToFrameSize;
 
     Vector<IntRect> m_tickmarks;
 };
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_FRAME_FRAMEVIEW_H_