| 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 10 matching lines...) Expand all Loading... |
| 21 * Boston, MA 02110-1301, USA. | 21 * Boston, MA 02110-1301, USA. |
| 22 */ | 22 */ |
| 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 SVGPathBuilder::SVGPathBuilder() | |
| 32 : m_path(0) | |
| 33 { | |
| 34 } | |
| 35 | |
| 36 void SVGPathBuilder::moveTo(const FloatPoint& targetPoint, bool closed, PathCoor
dinateMode mode) | 31 void SVGPathBuilder::moveTo(const FloatPoint& targetPoint, bool closed, PathCoor
dinateMode mode) |
| 37 { | 32 { |
| 38 ASSERT(m_path); | |
| 39 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; | 33 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; |
| 40 if (closed && !m_path->isEmpty()) | 34 if (closed && !m_path.isEmpty()) |
| 41 m_path->closeSubpath(); | 35 m_path.closeSubpath(); |
| 42 m_path->moveTo(m_current); | 36 m_path.moveTo(m_current); |
| 43 } | 37 } |
| 44 | 38 |
| 45 void SVGPathBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinateMode mo
de) | 39 void SVGPathBuilder::lineTo(const FloatPoint& targetPoint, PathCoordinateMode mo
de) |
| 46 { | 40 { |
| 47 ASSERT(m_path); | |
| 48 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; | 41 m_current = mode == AbsoluteCoordinates ? targetPoint : m_current + targetPo
int; |
| 49 m_path->addLineTo(m_current); | 42 m_path.addLineTo(m_current); |
| 50 } | 43 } |
| 51 | 44 |
| 52 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) |
| 53 { | 46 { |
| 54 ASSERT(m_path); | |
| 55 if (mode == RelativeCoordinates) { | 47 if (mode == RelativeCoordinates) { |
| 56 m_path->addBezierCurveTo(m_current + point1, m_current + point2, m_curre
nt + targetPoint); | 48 m_path.addBezierCurveTo(m_current + point1, m_current + point2, m_curren
t + targetPoint); |
| 57 m_current += targetPoint; | 49 m_current += targetPoint; |
| 58 } else { | 50 } else { |
| 59 m_current = targetPoint; | 51 m_current = targetPoint; |
| 60 m_path->addBezierCurveTo(point1, point2, m_current); | 52 m_path.addBezierCurveTo(point1, point2, m_current); |
| 61 } | 53 } |
| 62 } | 54 } |
| 63 | 55 |
| 64 void SVGPathBuilder::closePath() | 56 void SVGPathBuilder::closePath() |
| 65 { | 57 { |
| 66 ASSERT(m_path); | 58 m_path.closeSubpath(); |
| 67 m_path->closeSubpath(); | |
| 68 } | 59 } |
| 69 | 60 |
| 70 } | 61 } |
| OLD | NEW |