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

Side by Side Diff: third_party/WebKit/Source/core/animation/animatable/AnimatableSVGPaint.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "core/animation/animatable/AnimatableSVGPaint.h" 31 #include "core/animation/animatable/AnimatableSVGPaint.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 bool AnimatableSVGPaint::usesDefaultInterpolationWith(
36 const AnimatableValue* value) const {
37 const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value);
38 return (paintType() != SVG_PAINTTYPE_RGBCOLOR ||
39 svgPaint->paintType() != SVG_PAINTTYPE_RGBCOLOR) &&
40 (visitedLinkPaintType() != SVG_PAINTTYPE_RGBCOLOR ||
41 svgPaint->visitedLinkPaintType() != SVG_PAINTTYPE_RGBCOLOR);
42 }
43
44 PassRefPtr<AnimatableValue> AnimatableSVGPaint::interpolateTo(
45 const AnimatableValue* value,
46 double fraction) const {
47 if (usesDefaultInterpolationWith(value))
48 return defaultInterpolateTo(this, value, fraction);
49
50 const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value);
51 RefPtr<AnimatableColor> color =
52 toAnimatableColor(AnimatableValue::interpolate(
53 m_color.get(), svgPaint->m_color.get(), fraction)
54 .get());
55 if (fraction < 0.5)
56 return create(paintType(), visitedLinkPaintType(), color, uri(),
57 visitedLinkURI());
58 return create(svgPaint->paintType(), svgPaint->visitedLinkPaintType(), color,
59 svgPaint->uri(), svgPaint->visitedLinkURI());
60 }
61
62 bool AnimatableSVGPaint::equalTo(const AnimatableValue* value) const { 35 bool AnimatableSVGPaint::equalTo(const AnimatableValue* value) const {
63 const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value); 36 const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value);
64 return paintType() == svgPaint->paintType() && 37 return m_type == svgPaint->m_type &&
65 visitedLinkPaintType() == svgPaint->visitedLinkPaintType() && 38 m_visitedLinkType == svgPaint->m_visitedLinkType &&
66 getColor() == svgPaint->getColor() && uri() == svgPaint->uri() && 39 m_color->equals(svgPaint->m_color.get()) && m_uri == svgPaint->m_uri &&
67 visitedLinkURI() == svgPaint->visitedLinkURI(); 40 m_visitedLinkURI == svgPaint->m_visitedLinkURI;
68 } 41 }
69 42
70 } // namespace blink 43 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698