Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1179)

Unified Diff: sky/engine/platform/scroll/ScrollableArea.cpp

Issue 711483003: Deduplicate part of RenderLayerScrollableArea/ScrollableArea. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/platform/scroll/ScrollableArea.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/scroll/ScrollableArea.cpp
diff --git a/sky/engine/platform/scroll/ScrollableArea.cpp b/sky/engine/platform/scroll/ScrollableArea.cpp
index b4a046d7264b0279cb3b6b1e2a67f8d76e34c1aa..6c5339b410a2d70e62bb27e4b7864357f444d760 100644
--- a/sky/engine/platform/scroll/ScrollableArea.cpp
+++ b/sky/engine/platform/scroll/ScrollableArea.cpp
@@ -420,14 +420,6 @@ void ScrollableArea::cancelProgrammaticScrollAnimation()
programmaticScrollAnimator->cancelAnimation();
}
-IntRect ScrollableArea::visibleContentRect(IncludeScrollbarsInRect scrollbarInclusion) const
-{
- return IntRect(scrollPosition().x(),
- scrollPosition().y(),
- std::max(0, visibleWidth()),
- std::max(0, visibleHeight()));
-}
-
IntPoint ScrollableArea::clampScrollPosition(const IntPoint& scrollPosition) const
{
return scrollPosition.shrunkTo(maximumScrollPosition()).expandedTo(minimumScrollPosition());
@@ -438,15 +430,6 @@ int ScrollableArea::lineStep(ScrollbarOrientation) const
return pixelsPerLineStep();
}
-int ScrollableArea::pageStep(ScrollbarOrientation orientation) const
-{
- int length = (orientation == HorizontalScrollbar) ? visibleWidth() : visibleHeight();
- int minPageStep = static_cast<float>(length) * minFractionToStepWhenPaging();
- int pageStep = std::max(minPageStep, length - maxOverlapBetweenPages());
-
- return std::max(pageStep, 1);
-}
-
int ScrollableArea::documentStep(ScrollbarOrientation orientation) const
{
return scrollSize(orientation);
« no previous file with comments | « sky/engine/platform/scroll/ScrollableArea.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698