| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 // If this class were ever given a localTransform(), then the above would re
ad: | 98 // If this class were ever given a localTransform(), then the above would re
ad: |
| 99 // return viewportTranslation * localTransform() * viewportTransform(); | 99 // return viewportTranslation * localTransform() * viewportTransform(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 FloatPoint RenderSVGResourceMarker::referencePoint() const | 102 FloatPoint RenderSVGResourceMarker::referencePoint() const |
| 103 { | 103 { |
| 104 SVGMarkerElement* marker = toSVGMarkerElement(element()); | 104 SVGMarkerElement* marker = toSVGMarkerElement(element()); |
| 105 ASSERT(marker); | 105 ASSERT(marker); |
| 106 | 106 |
| 107 SVGLengthContext lengthContext(marker); | 107 SVGLengthContext lengthContext(marker); |
| 108 return FloatPoint(marker->refXCurrentValue().value(lengthContext), marker->r
efYCurrentValue().value(lengthContext)); | 108 return FloatPoint(marker->refX()->currentValue()->value(lengthContext), mark
er->refY()->currentValue()->value(lengthContext)); |
| 109 } | 109 } |
| 110 | 110 |
| 111 float RenderSVGResourceMarker::angle() const | 111 float RenderSVGResourceMarker::angle() const |
| 112 { | 112 { |
| 113 SVGMarkerElement* marker = toSVGMarkerElement(element()); | 113 SVGMarkerElement* marker = toSVGMarkerElement(element()); |
| 114 ASSERT(marker); | 114 ASSERT(marker); |
| 115 | 115 |
| 116 float angle = -1; | 116 float angle = -1; |
| 117 if (marker->orientTypeCurrentValue() == SVGMarkerOrientAngle) | 117 if (marker->orientTypeCurrentValue() == SVGMarkerOrientAngle) |
| 118 angle = marker->orientAngleCurrentValue().value(); | 118 angle = marker->orientAngleCurrentValue().value(); |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 174 |
| 175 void RenderSVGResourceMarker::calcViewport() | 175 void RenderSVGResourceMarker::calcViewport() |
| 176 { | 176 { |
| 177 if (!selfNeedsLayout()) | 177 if (!selfNeedsLayout()) |
| 178 return; | 178 return; |
| 179 | 179 |
| 180 SVGMarkerElement* marker = toSVGMarkerElement(element()); | 180 SVGMarkerElement* marker = toSVGMarkerElement(element()); |
| 181 ASSERT(marker); | 181 ASSERT(marker); |
| 182 | 182 |
| 183 SVGLengthContext lengthContext(marker); | 183 SVGLengthContext lengthContext(marker); |
| 184 float w = marker->markerWidthCurrentValue().value(lengthContext); | 184 float w = marker->markerWidth()->currentValue()->value(lengthContext); |
| 185 float h = marker->markerHeightCurrentValue().value(lengthContext); | 185 float h = marker->markerHeight()->currentValue()->value(lengthContext); |
| 186 m_viewport = FloatRect(0, 0, w, h); | 186 m_viewport = FloatRect(0, 0, w, h); |
| 187 } | 187 } |
| 188 | 188 |
| 189 } | 189 } |
| OLD | NEW |