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

Unified Diff: third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp

Issue 2750293003: Delete unused AnimatableValue code (Closed)
Patch Set: Fix unit tests Created 3 years, 9 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
Index: third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp
index 7539cb721855618ab90adde0dcd7bcd0c1968652..2013b21a1ecb7d0fb03d7b13a5cf4ff428d65d51 100644
--- a/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp
+++ b/third_party/WebKit/Source/core/animation/animatable/AnimatableColor.cpp
@@ -30,7 +30,6 @@
#include "core/animation/animatable/AnimatableColor.h"
-#include "platform/animation/AnimationUtilities.h"
namespace blink {
@@ -49,20 +48,6 @@ AnimatableColorImpl::AnimatableColorImpl(Color color)
m_green(color.green() / 255.0f * m_alpha),
m_blue(color.blue() / 255.0f * m_alpha) {}
-Color AnimatableColorImpl::toColor() const {
- if (!m_alpha)
- return Color::transparent;
- return Color(m_red / m_alpha, m_green / m_alpha, m_blue / m_alpha, m_alpha);
-}
-
-AnimatableColorImpl AnimatableColorImpl::interpolateTo(
- const AnimatableColorImpl& to,
- double fraction) const {
- return AnimatableColorImpl(
- blend(m_red, to.m_red, fraction), blend(m_green, to.m_green, fraction),
- blend(m_blue, to.m_blue, fraction), blend(m_alpha, to.m_alpha, fraction));
-}
-
bool AnimatableColorImpl::operator==(const AnimatableColorImpl& other) const {
return m_red == other.m_red && m_green == other.m_green &&
m_blue == other.m_blue && m_alpha == other.m_alpha;
@@ -74,15 +59,6 @@ PassRefPtr<AnimatableColor> AnimatableColor::create(
return adoptRef(new AnimatableColor(color, visitedLinkColor));
}
-PassRefPtr<AnimatableValue> AnimatableColor::interpolateTo(
- const AnimatableValue* value,
- double fraction) const {
- const AnimatableColor* color = toAnimatableColor(value);
- return create(
- m_color.interpolateTo(color->m_color, fraction),
- m_visitedLinkColor.interpolateTo(color->m_visitedLinkColor, fraction));
-}
-
bool AnimatableColor::equalTo(const AnimatableValue* value) const {
const AnimatableColor* color = toAnimatableColor(value);
return m_color == color->m_color &&

Powered by Google App Engine
This is Rietveld 408576698