Index: sky/engine/core/frame/FrameView.h |
diff --git a/sky/engine/core/frame/FrameView.h b/sky/engine/core/frame/FrameView.h |
index 6cef375c85304d992cdcff57142aee25fe00501c..740731413535c5549eec785a7721bb38acfcad20 100644 |
--- a/sky/engine/core/frame/FrameView.h |
+++ b/sky/engine/core/frame/FrameView.h |
@@ -95,6 +95,7 @@ public: |
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; |
void setLayoutSize(const IntSize&); |
@@ -112,7 +113,6 @@ public: |
bool isEnclosedInCompositingLayer() const; |
void prepareForDetach(); |
- virtual void recalculateScrollbarOverlayStyle(); |
void clear(); |
@@ -138,8 +138,6 @@ public: |
AtomicString mediaType() const; |
void setMediaType(const AtomicString&); |
- void restoreScrollbar(); |
- |
void postLayoutTimerFired(Timer<FrameView>*); |
bool wasScrolledByUser() const; |
@@ -163,21 +161,12 @@ public: |
void forceLayout(bool allowSubtree = false); |
- void scrollContentsIfNeededRecursive(); |
- |
// Methods to convert points and rects between the coordinate space of the renderer, and this view. |
IntRect convertFromRenderer(const RenderObject&, const IntRect&) const; |
IntRect convertToRenderer(const RenderObject&, const IntRect&) const; |
IntPoint convertFromRenderer(const RenderObject&, const IntPoint&) const; |
IntPoint convertToRenderer(const RenderObject&, const IntPoint&) const; |
- bool isScrollable(); |
- |
- enum ScrollbarModesCalculationStrategy { RulesFromWebContentOnly, AnyRule }; |
- void calculateScrollbarModesForLayoutAndSetViewportRenderer(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy = AnyRule); |
- |
- // FIXME(sky): Maybe remove now that we're not a ScrollView? |
- IntPoint lastKnownMousePosition() const; |
bool shouldSetCursor() const; |
void setCursor(const Cursor&); |
@@ -232,7 +221,6 @@ public: |
// ScrollableArea interface |
// FIXME(sky): Remove |
- void invalidateScrollbarRect(Scrollbar*, const IntRect&); |
void getTickmarks(Vector<IntRect>&) const; |
IntRect scrollableAreaBoundingBox() const; |
bool scrollAnimatorEnabled() const; |
@@ -265,10 +253,6 @@ public: |
bool clipsPaintInvalidations() const { return true; } |
protected: |
- virtual void scrollContentsIfNeeded(); |
- bool scrollContentsFastPath(const IntSize& scrollDelta); |
- void scrollContentsSlowPath(const IntRect& updateRect); |
- |
bool isVerticalDocument() const; |
bool isFlippedDocument() const; |
@@ -283,9 +267,6 @@ private: |
bool contentsInCompositedLayer() const; |
- void applyOverflowToViewportAndSetRenderer(RenderObject*, ScrollbarMode& hMode, ScrollbarMode& vMode); |
- void updateOverflowStatus(bool horizontalOverflow, bool verticalOverflow); |
- |
void forceLayoutParentViewIfNeeded(); |
void performPreLayoutTasks(); |
void performLayout(RenderObject* rootForThisLayout, bool inSubtreeLayout); |
@@ -301,7 +282,6 @@ private: |
// FIXME(sky): Remove now that we're not a ScrollView? |
void contentRectangleForPaintInvalidation(const IntRect&); |
void contentsResized(); |
- void scrollbarExistenceDidChange(); |
// Override ScrollView methods to do point conversion via renderers, in order to |
// take transforms into account. |
@@ -335,9 +315,6 @@ private: |
bool m_doFullPaintInvalidation; |
- // FIXME(sky): Remove |
- bool m_canHaveScrollbars; |
- |
bool m_hasPendingLayout; |
RenderObject* m_layoutSubtreeRoot; |