OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2002, 2003 The Karbon Developers | 2 * Copyright (C) 2002, 2003 The Karbon Developers |
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> | 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> |
4 * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org> | 4 * Copyright (C) 2006, 2007 Rob Buis <buis@kde.org> |
5 * Copyright (C) 2007, 2009 Apple Inc. All rights reserved. | 5 * Copyright (C) 2007, 2009 Apple Inc. All rights reserved. |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 12 matching lines...) Expand all Loading... |
23 | 23 |
24 #include "config.h" | 24 #include "config.h" |
25 #include "core/svg/SVGPathBuilder.h" | 25 #include "core/svg/SVGPathBuilder.h" |
26 | 26 |
27 #include "platform/graphics/Path.h" | 27 #include "platform/graphics/Path.h" |
28 | 28 |
29 namespace blink { | 29 namespace blink { |
30 | 30 |
31 void SVGPathBuilder::moveTo(const FloatPoint& targetPoint, bool closed, PathCoor
dinateMode mode) | 31 void SVGPathBuilder::moveTo(const FloatPoint& targetPoint, bool closed, PathCoor
dinateMode mode) |
32 { | 32 { |
33 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; | 33 ASSERT(mode == AbsoluteCoordinates); |
34 if (closed && !m_path.isEmpty()) | 34 if (closed && !m_path.isEmpty()) |
35 m_path.closeSubpath(); | 35 m_path.closeSubpath(); |
36 m_path.moveTo(m_current); | 36 m_path.moveTo(targetPoint); |
37 } | 37 } |
38 | 38 |
39 void SVGPathBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinateMode mo
de) | 39 void SVGPathBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinateMode mo
de) |
40 { | 40 { |
41 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; | 41 ASSERT(mode == AbsoluteCoordinates); |
42 m_path.addLineTo(m_current); | 42 m_path.addLineTo(targetPoint); |
43 } | 43 } |
44 | 44 |
45 void SVGPathBuilder::curveToCubic(const FloatPoint& point1, const FloatPoint& po
int2, const FloatPoint& targetPoint, PathCoordinateMode mode) | 45 void SVGPathBuilder::curveToCubic(const FloatPoint& point1, const FloatPoint& po
int2, const FloatPoint& targetPoint, PathCoordinateMode mode) |
46 { | 46 { |
47 if (mode == RelativeCoordinates) { | 47 ASSERT(mode == AbsoluteCoordinates); |
48 m_path.addBezierCurveTo(m_current + point1, m_current + point2, m_curren
t + targetPoint); | 48 m_path.addBezierCurveTo(point1, point2, targetPoint); |
49 m_current += targetPoint; | |
50 } else { | |
51 m_current = targetPoint; | |
52 m_path.addBezierCurveTo(point1, point2, m_current); | |
53 } | |
54 } | 49 } |
55 | 50 |
56 void SVGPathBuilder::closePath() | 51 void SVGPathBuilder::closePath() |
57 { | 52 { |
58 m_path.closeSubpath(); | 53 m_path.closeSubpath(); |
59 } | 54 } |
60 | 55 |
61 } | 56 } |
OLD | NEW |