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

Unified Diff: third_party/WebKit/Source/core/animation/animatable/AnimatablePath.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/AnimatablePath.cpp
diff --git a/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp b/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp
index a5f40b49b2b8592d769c8910989127f21f13a54e..317293e1055c36e4fc64fcb164c3c916e22af31f 100644
--- a/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp
+++ b/third_party/WebKit/Source/core/animation/animatable/AnimatablePath.cpp
@@ -5,62 +5,11 @@
#include "core/animation/animatable/AnimatablePath.h"
#include "core/style/DataEquivalency.h"
-#include "core/svg/SVGPathBlender.h"
-#include "core/svg/SVGPathByteStreamBuilder.h"
-#include "core/svg/SVGPathByteStreamSource.h"
-#include <memory>
namespace blink {
-bool AnimatablePath::usesDefaultInterpolationWith(
- const AnimatableValue* value) const {
- // Default interpolation is used if the paths have different lengths,
- // or the paths have a segment with different types (ignoring "relativeness").
-
- const StylePath* toPath = toAnimatablePath(value)->path();
- if (!m_path || !toPath)
- return true;
- SVGPathByteStreamSource fromSource(path()->byteStream());
- SVGPathByteStreamSource toSource(toPath->byteStream());
-
- while (fromSource.hasMoreData()) {
- if (!toSource.hasMoreData())
- return true;
-
- PathSegmentData fromSeg = fromSource.parseSegment();
- PathSegmentData toSeg = toSource.parseSegment();
- DCHECK_NE(fromSeg.command, PathSegUnknown);
- DCHECK_NE(toSeg.command, PathSegUnknown);
-
- if (toAbsolutePathSegType(fromSeg.command) !=
- toAbsolutePathSegType(toSeg.command))
- return true;
- }
-
- return toSource.hasMoreData();
-}
-
-PassRefPtr<AnimatableValue> AnimatablePath::interpolateTo(
- const AnimatableValue* value,
- double fraction) const {
- if (usesDefaultInterpolationWith(value))
- return defaultInterpolateTo(this, value, fraction);
-
- std::unique_ptr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
- SVGPathByteStreamBuilder builder(*byteStream);
-
- SVGPathByteStreamSource fromSource(path()->byteStream());
- SVGPathByteStreamSource toSource(
- toAnimatablePath(value)->path()->byteStream());
-
- SVGPathBlender blender(&fromSource, &toSource, &builder);
- bool ok = blender.blendAnimatedPath(fraction);
- ALLOW_UNUSED_LOCAL(ok);
- return AnimatablePath::create(StylePath::create(std::move(byteStream)));
-}
-
bool AnimatablePath::equalTo(const AnimatableValue* value) const {
- return dataEquivalent(m_path.get(), toAnimatablePath(value)->path());
+ return dataEquivalent(m_path.get(), toAnimatablePath(value)->m_path.get());
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698