From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- WebCore/platform/ScrollView.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'WebCore/platform/ScrollView.h') diff --git a/WebCore/platform/ScrollView.h b/WebCore/platform/ScrollView.h index e9c7feb..660cfc6 100644 --- a/WebCore/platform/ScrollView.h +++ b/WebCore/platform/ScrollView.h @@ -167,9 +167,6 @@ public: IntPoint scrollPosition() const { return visibleContentRect().location(); } IntSize scrollOffset() const { return visibleContentRect().location() - IntPoint(); } // Gets the scrolled position as an IntSize. Convenient for adding to other sizes. IntPoint maximumScrollPosition() const; // The maximum position we can be scrolled to. - IntPoint minimumScrollPosition() const; // The minimum position we can be scrolled to. - // Adjust the passed in scroll position to keep it between the minimum and maximum positions. - IntPoint adjustScrollPositionWithinRange(const IntPoint&) const; int scrollX() const { return scrollPosition().x(); } int scrollY() const { return scrollPosition().y(); } @@ -289,9 +286,6 @@ protected: // Scroll the content by invalidating everything. virtual void scrollContentsSlowPath(const IntRect& updateRect); - void setScrollOrigin(const IntPoint&, bool updatePosition); - IntPoint scrollOrigin() { return m_scrollOrigin; } - private: RefPtr m_horizontalScrollbar; RefPtr m_verticalScrollbar; @@ -327,19 +321,6 @@ private: bool m_paintsEntireContents; bool m_delegatesScrolling; - // There are 8 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis - // if there is any reversed direction or writing-mode. The combinations are: - // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set - // horizontal-tb / ltr NO NO - // horizontal-tb / rtl YES NO - // horizontal-bt / ltr NO YES - // horizontal-bt / rtl YES YES - // vertical-lr / ltr NO NO - // vertical-lr / rtl NO YES - // vertical-rl / ltr YES NO - // vertical-rl / rtl YES YES - IntPoint m_scrollOrigin; - void init(); void destroy(); @@ -367,8 +348,6 @@ private: void platformSetScrollbarsSuppressed(bool repaintOnUnsuppress); void platformRepaintContentRectangle(const IntRect&, bool now); bool platformIsOffscreen() const; - - void platformSetScrollOrigin(const IntPoint&, bool updatePosition); #if PLATFORM(ANDROID) int platformActualWidth() const; -- cgit v1.1