Index: Source/core/frame/FrameView.h |
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h |
index 07ccb28aa615c5404ea1573685f16da955149182..8f0d21a4dbf330997f6b51b59573564216140802 100644 |
--- a/Source/core/frame/FrameView.h |
+++ b/Source/core/frame/FrameView.h |
@@ -151,8 +151,6 @@ public: |
void setInputEventsTransformForEmulation(const IntSize&, float); |
virtual void setScrollPosition(const IntPoint&) OVERRIDE; |
- virtual void repaintFixedElementsAfterScrolling() OVERRIDE; |
- virtual void updateFixedElementsAfterScrolling() OVERRIDE; |
virtual bool shouldRubberBandInDirection(ScrollDirection) const OVERRIDE; |
virtual bool isRubberBandInProgress() const OVERRIDE; |
void setScrollPositionNonProgrammatically(const IntPoint&); |
@@ -233,6 +231,7 @@ public: |
bool scrollToAnchor(const String&); |
void maintainScrollPositionAtAnchor(Node*); |
void scrollElementToRect(Element*, const IntRect&); |
+ 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; |
@@ -331,6 +330,7 @@ public: |
virtual GraphicsLayer* layerForScrollCorner() const OVERRIDE; |
protected: |
+ virtual void scrollContentsIfNeeded(); |
virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) OVERRIDE; |
virtual void scrollContentsSlowPath(const IntRect& updateRect) OVERRIDE; |
@@ -394,6 +394,9 @@ private: |
void scrollPositionChanged(); |
void didScrollTimerFired(Timer<FrameView>*); |
+ void updateLayersAndCompositingAfterScrollIfNeeded(); |
+ void updateFixedElementRepaintRectsAfterScroll(); |
+ |
bool hasCustomScrollbars() const; |
bool shouldUseCustomScrollbars(Element*& customScrollbarElement, LocalFrame*& customScrollbarFrame); |