diff options
Diffstat (limited to 'WebCore/platform/ScrollView.h')
| -rw-r--r-- | WebCore/platform/ScrollView.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h index f7bfbe8..9847350 100644 --- a/WebCore/platform/ScrollView.h +++ b/WebCore/platform/ScrollView.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2004, 2006, 2007, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2009 Holger Hans Peter Freyther * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,9 +47,6 @@ typedef struct _GtkAdjustment GtkAdjustment; class wxScrollWinEvent; #endif -// DANGER WILL ROBINSON! THIS FILE IS UNDERGOING HEAVY REFACTORING. -// Everything is changing! -// Port authors should wait until this refactoring is complete before attempting to implement this interface. namespace WebCore { class HostWindow; @@ -125,7 +123,7 @@ public: // Methods for getting/setting the size of the document contained inside the ScrollView (as an IntSize or as individual width and height // values). - IntSize contentsSize() const; + IntSize contentsSize() const; // Always at least as big as the visibleWidth()/visibleHeight(). int contentsWidth() const { return contentsSize().width(); } int contentsHeight() const { return contentsSize().height(); } virtual void setContentsSize(const IntSize&); @@ -254,6 +252,7 @@ private: bool m_scrollbarsSuppressed; bool m_inUpdateScrollbars; + unsigned m_updateScrollbarsPass; IntPoint m_panScrollIconPoint; bool m_drawPanScrollIcon; @@ -283,10 +282,6 @@ private: void platformSetScrollbarsSuppressed(bool repaintOnUnsuppress); void platformRepaintContentRectangle(const IntRect&, bool now); bool platformIsOffscreen() const; - bool platformHandleHorizontalAdjustment(const IntSize&); - bool platformHandleVerticalAdjustment(const IntSize&); - bool platformHasHorizontalAdjustment() const; - bool platformHasVerticalAdjustment() const; #if PLATFORM(MAC) && defined __OBJC__ public: @@ -297,9 +292,11 @@ private: #endif #if PLATFORM(QT) +public: + void adjustWidgetsPreventingBlittingCount(int delta); private: - bool rootPreventsBlitting() const { return root()->m_widgetsThatPreventBlitting > 0; } - unsigned m_widgetsThatPreventBlitting; + bool rootPreventsBlitting() const { return root()->m_widgetsPreventingBlitting > 0; } + unsigned m_widgetsPreventingBlitting; #else bool rootPreventsBlitting() const { return false; } #endif |