| Index: Source/core/platform/ScrollView.h
|
| diff --git a/Source/core/platform/ScrollView.h b/Source/core/platform/ScrollView.h
|
| index fff4633722544e11bd8a15a1b7aac15395dcc572..21e468567a209093acb929305912fb250314d224 100644
|
| --- a/Source/core/platform/ScrollView.h
|
| +++ b/Source/core/platform/ScrollView.h
|
| @@ -135,13 +135,9 @@ public:
|
|
|
| // 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;
|
| + virtual 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).
|
| @@ -318,7 +314,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;
|
|
|