diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/gtk/ScrollViewGtk.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/gtk/ScrollViewGtk.cpp')
| -rw-r--r-- | Source/WebCore/platform/gtk/ScrollViewGtk.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/WebCore/platform/gtk/ScrollViewGtk.cpp b/Source/WebCore/platform/gtk/ScrollViewGtk.cpp index a8c7562..c5f32f3 100644 --- a/Source/WebCore/platform/gtk/ScrollViewGtk.cpp +++ b/Source/WebCore/platform/gtk/ScrollViewGtk.cpp @@ -162,14 +162,6 @@ void ScrollView::setGtkAdjustments(GtkAdjustment* hadj, GtkAdjustment* vadj, boo setVerticalAdjustment(vadj, resetValues); } -void ScrollView::platformAddChild(Widget* child) -{ -} - -void ScrollView::platformRemoveChild(Widget* child) -{ -} - IntRect ScrollView::visibleContentRect(bool includeScrollbars) const { // If we are an interior frame scrollbar or are in some sort of transition @@ -177,8 +169,8 @@ IntRect ScrollView::visibleContentRect(bool includeScrollbars) const // scrollbar width should be. if (parent() || !hostWindow() || !hostWindow()->platformPageClient()) { return IntRect(IntPoint(m_scrollOffset.width(), m_scrollOffset.height()), - IntSize(max(0, width() - (verticalScrollbar() && !includeScrollbars ? verticalScrollbar()->width() : 0)), - max(0, height() - (horizontalScrollbar() && !includeScrollbars ? horizontalScrollbar()->height() : 0)))); + IntSize(max(0, m_boundsSize.width() - (verticalScrollbar() && !includeScrollbars ? verticalScrollbar()->width() : 0)), + max(0, m_boundsSize.height() - (horizontalScrollbar() && !includeScrollbars ? horizontalScrollbar()->height() : 0)))); } // We don't have a parent, so we are the main frame and thus have |