diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/platform/ScrollView.h | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/platform/ScrollView.h')
| -rw-r--r-- | WebCore/platform/ScrollView.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h index 5624d70..a55fed4 100644 --- a/WebCore/platform/ScrollView.h +++ b/WebCore/platform/ScrollView.h @@ -40,6 +40,7 @@ #endif #if PLATFORM(GTK) +#include "GRefPtrGtk.h" typedef struct _GtkAdjustment GtkAdjustment; #endif @@ -57,7 +58,9 @@ class ScrollView : public Widget, public ScrollbarClient { public: ~ScrollView(); - // ScrollbarClient function. FrameView overrides the others. + // ScrollbarClient functions. FrameView overrides the others. + virtual int scrollSize(ScrollbarOrientation orientation) const; + virtual void setScrollOffsetFromAnimation(const IntPoint&); virtual void valueChanged(Scrollbar*); // The window thats hosts the ScrollView. The ScrollView will communicate scrolls and repaints to the @@ -347,9 +350,11 @@ private: #if PLATFORM(GTK) public: void setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj, bool resetValues = true); - GtkAdjustment* m_horizontalAdjustment; - GtkAdjustment* m_verticalAdjustment; void setScrollOffset(const IntSize& offset) { m_scrollOffset = offset; } + +private: + PlatformRefPtr<GtkAdjustment> m_horizontalAdjustment; + PlatformRefPtr<GtkAdjustment> m_verticalAdjustment; #endif #if PLATFORM(WX) |