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

Unified Diff: Source/core/animation/AnimatableLength.cpp

Issue 363183003: Move Animatable* hierarchy into new folder. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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 | « Source/core/animation/AnimatableLength.h ('k') | Source/core/animation/AnimatableLengthBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimatableLength.cpp
diff --git a/Source/core/animation/AnimatableLength.cpp b/Source/core/animation/AnimatableLength.cpp
deleted file mode 100644
index c167c20a7527c3df73d1a0b49474c8fccf55173a..0000000000000000000000000000000000000000
--- a/Source/core/animation/AnimatableLength.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2013 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 "config.h"
-#include "core/animation/AnimatableLength.h"
-
-#include "platform/CalculationValue.h"
-#include "platform/animation/AnimationUtilities.h"
-
-namespace WebCore {
-
-namespace {
-
-double clampNumber(double value, ValueRange range)
-{
- if (range == ValueRangeNonNegative)
- return std::max(value, 0.0);
- ASSERT(range == ValueRangeAll);
- return value;
-}
-
-} // namespace
-
-AnimatableLength::AnimatableLength(const Length& length, float zoom)
-{
- ASSERT(zoom);
- PixelsAndPercent pixelsAndPercent = length.pixelsAndPercent();
- m_pixels = pixelsAndPercent.pixels / zoom;
- m_percent = pixelsAndPercent.percent;
- m_hasPixels = length.type() != Percent;
- m_hasPercent = !length.isFixed();
-}
-
-Length AnimatableLength::length(float zoom, ValueRange range) const
-{
- if (!m_hasPercent)
- return Length(clampNumber(m_pixels, range) * zoom, Fixed);
- if (!m_hasPixels)
- return Length(clampNumber(m_percent, range), Percent);
- return Length(CalculationValue::create(PixelsAndPercent(m_pixels * zoom, m_percent), range));
-}
-
-PassRefPtrWillBeRawPtr<AnimatableValue> AnimatableLength::interpolateTo(const AnimatableValue* value, double fraction) const
-{
- const AnimatableLength* length = toAnimatableLength(value);
- return create(blend(m_pixels, length->m_pixels, fraction), blend(m_percent, length->m_percent, fraction),
- m_hasPixels || length->m_hasPixels, m_hasPercent || length->m_hasPercent);
-}
-
-bool AnimatableLength::equalTo(const AnimatableValue* value) const
-{
- const AnimatableLength* length = toAnimatableLength(value);
- return m_pixels == length->m_pixels && m_percent == length->m_percent && m_hasPixels == length->m_hasPixels && m_hasPercent == length->m_hasPercent;
-}
-
-} // namespace WebCore
« no previous file with comments | « Source/core/animation/AnimatableLength.h ('k') | Source/core/animation/AnimatableLengthBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698