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

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

Issue 1023993002: Rework the SVGPathSource interface (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blender fixups. Created 5 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
« no previous file with comments | « Source/core/svg/SVGPathSource.h ('k') | Source/core/svg/SVGPathStringSource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGPathStringSource.h
diff --git a/Source/core/svg/SVGPathStringSource.h b/Source/core/svg/SVGPathStringSource.h
index 10dfebd1bca8b49b21b35f22d88f3847b893314d..599d442a0ac56a81ff434559528f074daa41b2ab 100644
--- a/Source/core/svg/SVGPathStringSource.h
+++ b/Source/core/svg/SVGPathStringSource.h
@@ -32,22 +32,16 @@ public:
private:
virtual bool hasMoreData() const override;
- virtual bool moveToNextToken() override;
- virtual bool parseSVGSegmentType(SVGPathSegType&) override;
- virtual SVGPathSegType nextCommand(SVGPathSegType previousCommand) override;
+ virtual SVGPathSegType peekSegmentType() override;
+ virtual PathSegmentData parseSegment() override;
- virtual bool parseMoveToSegment(FloatPoint&) override;
- virtual bool parseLineToSegment(FloatPoint&) override;
- virtual bool parseLineToHorizontalSegment(float&) override;
- virtual bool parseLineToVerticalSegment(float&) override;
- virtual bool parseCurveToCubicSegment(FloatPoint&, FloatPoint&, FloatPoint&) override;
- virtual bool parseCurveToCubicSmoothSegment(FloatPoint&, FloatPoint&) override;
- virtual bool parseCurveToQuadraticSegment(FloatPoint&, FloatPoint&) override;
- virtual bool parseCurveToQuadraticSmoothSegment(FloatPoint&) override;
- virtual bool parseArcToSegment(float&, float&, float&, bool&, bool&, FloatPoint&) override;
+ void eatWhitespace();
+ float parseNumberWithError();
+ bool parseArcFlagWithError();
String m_string;
bool m_is8BitSource;
+ bool m_seenError;
union {
const LChar* m_character8;
@@ -57,6 +51,8 @@ private:
const LChar* m_character8;
const UChar* m_character16;
} m_end;
+
+ SVGPathSegType m_previousCommand;
};
} // namespace blink
« no previous file with comments | « Source/core/svg/SVGPathSource.h ('k') | Source/core/svg/SVGPathStringSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698