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

Unified Diff: Source/core/svg/SVGPathBlender.h

Issue 1056873002: Move SVG path blend state to its own object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Re-order declarations. Created 5 years, 8 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 | « no previous file | Source/core/svg/SVGPathBlender.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGPathBlender.h
diff --git a/Source/core/svg/SVGPathBlender.h b/Source/core/svg/SVGPathBlender.h
index 60b2ba905c68e0dd70e08ee1968dafca7dfd2e82..cf0e10b3b3e6371cb8e39ea222d39b0a583fa350 100644
--- a/Source/core/svg/SVGPathBlender.h
+++ b/Source/core/svg/SVGPathBlender.h
@@ -20,17 +20,11 @@
#ifndef SVGPathBlender_h
#define SVGPathBlender_h
-#include "platform/geometry/FloatPoint.h"
#include "platform/heap/Handle.h"
#include "wtf/Noncopyable.h"
namespace blink {
-enum FloatBlendMode {
- BlendHorizontal,
- BlendVertical
-};
-
struct PathSegmentData;
class SVGPathConsumer;
class SVGPathSource;
@@ -46,36 +40,12 @@ public:
DECLARE_TRACE();
private:
- PathSegmentData blendMoveToSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendLineToSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendLineToHorizontalSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendLineToVerticalSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendCurveToCubicSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendCurveToCubicSmoothSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendCurveToQuadraticSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendCurveToQuadraticSmoothSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- PathSegmentData blendArcToSegment(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
- void blendSegments(const PathSegmentData& fromSeg, const PathSegmentData& toSeg);
-
- float blendAnimatedDimensonalFloat(float, float, FloatBlendMode);
- FloatPoint blendAnimatedFloatPoint(const FloatPoint& from, const FloatPoint& to);
- FloatPoint blendAnimatedFloatPointSameCoordinates(const FloatPoint& from, const FloatPoint& to);
+ class BlendState;
+ bool blendAnimatedPath(BlendState&);
RawPtrWillBeMember<SVGPathSource> m_fromSource;
RawPtrWillBeMember<SVGPathSource> m_toSource;
RawPtrWillBeMember<SVGPathConsumer> m_consumer;
-
- FloatPoint m_fromCurrentPoint;
- FloatPoint m_toCurrentPoint;
-
- float m_progress;
- unsigned m_addTypesCount;
- bool m_isInFirstHalfOfAnimation;
- // This is per-segment blend state corresponding to the 'from' and 'to'
- // segments currently being blended, and only used within blendSegments().
- bool m_typesAreEqual;
- bool m_fromIsAbsolute;
- bool m_toIsAbsolute;
};
} // namespace blink
« no previous file with comments | « no previous file | Source/core/svg/SVGPathBlender.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698