Refactor fixed layout mode

Source/core/platform/ScrollView.h

Index: Source/core/platform/ScrollView.h
diff --git a/Source/core/platform/ScrollView.h b/Source/core/platform/ScrollView.h
index 4b2de996058ee35619067f279087e04c7f27e75a..d04294b1623afd7c65c4651f15784b45d175ed5d 100644
--- a/Source/core/platform/ScrollView.h
+++ b/Source/core/platform/ScrollView.h
@@ -129,16 +129,6 @@ public:
     IntSize unscaledVisibleContentSize(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
     virtual float visibleContentScaleFactor() const { return 1; }
 
-    // Functions for getting/setting the size webkit should use to layout the contents. By default this is the same as the visible
-    // content size. Explicitly setting a layout size value will cause webkit to layout the contents using this size instead.
-    IntSize layoutSize(VisibleContentRectIncludesScrollbars = ExcludeScrollbars) const;
-    int layoutWidth(VisibleContentRectIncludesScrollbars scrollbarInclusion = ExcludeScrollbars) const { return layoutSize(scrollbarInclusion).width(); }
-    int layoutHeight(VisibleContentRectIncludesScrollbars scrollbarInclusion = ExcludeScrollbars) const { return layoutSize(scrollbarInclusion).height(); }
-    IntSize fixedLayoutSize() const;
-    void setFixedLayoutSize(const IntSize&);
-    bool useFixedLayout() const;
-    void setUseFixedLayout(bool enable);
-
     // Functions for getting/setting the size of the document contained inside the ScrollView (as an IntSize or as individual width and height
     // values).
     virtual IntSize contentsSize() const OVERRIDE; // Always at least as big as the visibleWidth()/visibleHeight().
@@ -296,6 +286,8 @@ protected:
     // Called to update the scrollbars to accurately reflect the state of the view.
     void updateScrollbars(const IntSize& desiredOffset);
 
+    IntSize excludeScrollbars(const IntSize&) const;
+
 private:
     RefPtr<Scrollbar> m_horizontalScrollbar;
     RefPtr<Scrollbar> m_verticalScrollbar;
@@ -313,7 +305,6 @@ private:
 
     IntSize m_scrollOffset; // FIXME: Would rather store this as a position, but we will wait to make this change until more code is shared.
     IntPoint m_cachedScrollPosition;
-    IntSize m_fixedLayoutSize;
     IntSize m_contentsSize;
 
     int m_scrollbarsAvoidingResizer;
@@ -324,7 +315,6 @@ private:
 
     IntPoint m_panScrollIconPoint;
     bool m_drawPanScrollIcon;
-    bool m_useFixedLayout;
 
     bool m_paintsEntireContents;
     bool m_clipsRepaints;