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

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

Issue 879993004: Remove ScrollableArea and Scrollbar (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months 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/ScrollAnimator.h ('k') | sky/engine/platform/scroll/ScrollTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/scroll/ScrollAnimator.cpp
diff --git a/sky/engine/platform/scroll/ScrollAnimator.cpp b/sky/engine/platform/scroll/ScrollAnimator.cpp
deleted file mode 100644
index d8a42e179c68f57b17cb03394bae1123e266ab80..0000000000000000000000000000000000000000
--- a/sky/engine/platform/scroll/ScrollAnimator.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2010, Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sky/engine/config.h"
-#include "sky/engine/platform/scroll/ScrollAnimator.h"
-
-#include <algorithm>
-#include "sky/engine/platform/geometry/FloatPoint.h"
-#include "sky/engine/platform/scroll/ScrollableArea.h"
-#include "sky/engine/wtf/PassOwnPtr.h"
-
-namespace blink {
-
-ScrollAnimator::ScrollAnimator(ScrollableArea* scrollableArea)
- : m_scrollableArea(scrollableArea)
- , m_currentPosX(0)
- , m_currentPosY(0)
-{
-}
-
-ScrollAnimator::~ScrollAnimator()
-{
-}
-
-PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea)
-{
- return adoptPtr(new ScrollAnimator(scrollableArea));
-}
-
-bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float delta)
-{
- float& currentPos = (orientation == HorizontalScrollbar) ? m_currentPosX : m_currentPosY;
- float newPos = clampScrollPosition(orientation, currentPos + step * delta);
- if (currentPos == newPos)
- return false;
- currentPos = newPos;
-
- notifyPositionChanged();
-
- return true;
-}
-
-void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
-{
- m_currentPosX = offset.x();
- m_currentPosY = offset.y();
- notifyPositionChanged();
-}
-
-void ScrollAnimator::setCurrentPosition(const FloatPoint& position)
-{
- m_currentPosX = position.x();
- m_currentPosY = position.y();
-}
-
-FloatPoint ScrollAnimator::currentPosition() const
-{
- return FloatPoint(m_currentPosX, m_currentPosY);
-}
-
-void ScrollAnimator::notifyPositionChanged()
-{
- m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_currentPosY));
-}
-
-float ScrollAnimator::clampScrollPosition(ScrollbarOrientation orientation, float pos)
-{
- float maxScrollPos = m_scrollableArea->maximumScrollPosition(orientation);
- float minScrollPos = m_scrollableArea->minimumScrollPosition(orientation);
- return std::max(std::min(pos, maxScrollPos), minScrollPos);
-}
-
-} // namespace blink
« no previous file with comments | « sky/engine/platform/scroll/ScrollAnimator.h ('k') | sky/engine/platform/scroll/ScrollTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698