Title: [107443] trunk/Source/WebCore
- Revision
- 107443
- Author
- ander...@apple.com
- Date
- 2012-02-10 14:25:10 -0800 (Fri, 10 Feb 2012)
Log Message
Remove a bunch of unused ScrollableArea member functions
https://bugs.webkit.org/show_bug.cgi?id=78388
Reviewed by Beth Dakin.
* platform/ScrollableArea.cpp:
* platform/ScrollableArea.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107442 => 107443)
--- trunk/Source/WebCore/ChangeLog 2012-02-10 22:20:53 UTC (rev 107442)
+++ trunk/Source/WebCore/ChangeLog 2012-02-10 22:25:10 UTC (rev 107443)
@@ -1,3 +1,13 @@
+2012-02-10 Anders Carlsson <ander...@apple.com>
+
+ Remove a bunch of unused ScrollableArea member functions
+ https://bugs.webkit.org/show_bug.cgi?id=78388
+
+ Reviewed by Beth Dakin.
+
+ * platform/ScrollableArea.cpp:
+ * platform/ScrollableArea.h:
+
2012-02-10 Pavel Podivilov <podivi...@chromium.org>
Fix a few typos in IDL exception names.
Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (107442 => 107443)
--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-10 22:20:53 UTC (rev 107442)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp 2012-02-10 22:25:10 UTC (rev 107443)
@@ -282,29 +282,6 @@
}
}
-bool ScrollableArea::isPinnedInBothDirections(const IntSize& scrollDelta) const
-{
- return isPinnedHorizontallyInDirection(scrollDelta.width()) && isPinnedVerticallyInDirection(scrollDelta.height());
-}
-
-bool ScrollableArea::isPinnedHorizontallyInDirection(int horizontalScrollDelta) const
-{
- if (horizontalScrollDelta < 0 && isHorizontalScrollerPinnedToMinimumPosition())
- return true;
- if (horizontalScrollDelta > 0 && isHorizontalScrollerPinnedToMaximumPosition())
- return true;
- return false;
-}
-
-bool ScrollableArea::isPinnedVerticallyInDirection(int verticalScrollDelta) const
-{
- if (verticalScrollDelta < 0 && isVerticalScrollerPinnedToMinimumPosition())
- return true;
- if (verticalScrollDelta > 0 && isVerticalScrollerPinnedToMaximumPosition())
- return true;
- return false;
-}
-
void ScrollableArea::invalidateScrollbar(Scrollbar* scrollbar, const IntRect& rect)
{
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/platform/ScrollableArea.h (107442 => 107443)
--- trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-10 22:20:53 UTC (rev 107442)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2012-02-10 22:25:10 UTC (rev 107443)
@@ -141,21 +141,12 @@
virtual bool isOnActivePage() const { ASSERT_NOT_REACHED(); return true; }
- bool isHorizontalScrollerPinnedToMinimumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) <= minimumScrollPosition().x(); }
- bool isHorizontalScrollerPinnedToMaximumPosition() const { return !horizontalScrollbar() || scrollPosition(horizontalScrollbar()) >= maximumScrollPosition().x(); }
- bool isVerticalScrollerPinnedToMinimumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) <= minimumScrollPosition().y(); }
- bool isVerticalScrollerPinnedToMaximumPosition() const { return !verticalScrollbar() || scrollPosition(verticalScrollbar()) >= maximumScrollPosition().y(); }
-
// Note that this only returns scrollable areas that can actually be scrolled.
virtual ScrollableArea* enclosingScrollableArea() const = 0;
// Returns the bounding box of this scrollable area, in the coordinate system of the enclosing scroll view.
virtual IntRect scrollableAreaBoundingBox() const { ASSERT_NOT_REACHED(); return IntRect(); }
- bool isPinnedInBothDirections(const IntSize&) const;
- bool isPinnedHorizontallyInDirection(int horizontalScrollDelta) const;
- bool isPinnedVerticallyInDirection(int verticalScrollDelta) const;
-
virtual bool shouldRubberBandInDirection(ScrollDirection) const { return true; }
virtual bool scrollAnimatorEnabled() const { return false; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
