diff options
author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/platform/ScrollView.h | |
parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/platform/ScrollView.h')
-rw-r--r-- | WebCore/platform/ScrollView.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h index 1744963..739e1ac 100644 --- a/WebCore/platform/ScrollView.h +++ b/WebCore/platform/ScrollView.h @@ -271,8 +271,10 @@ protected: virtual void updateScrollCorner(); virtual void paintScrollCorner(GraphicsContext*, const IntRect& cornerRect); - // Scroll the content by blitting the pixels + // Scroll the content by blitting the pixels. virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect); + // Scroll the content by invalidating everything. + virtual void scrollContentsSlowPath(const IntRect& updateRect); private: RefPtr<Scrollbar> m_horizontalScrollbar; @@ -353,6 +355,8 @@ private: #if PLATFORM(GTK) public: void setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj, bool resetValues = true); + void setHorizontalAdjustment(GtkAdjustment* hadj, bool resetValues = true); + void setVerticalAdjustment(GtkAdjustment* vadj, bool resetValues = true); void setScrollOffset(const IntSize& offset) { m_scrollOffset = offset; } private: |