| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
| 13 * | 13 * |
| 14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
| 15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
| 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
| 18 */ | 18 */ |
| 19 | 19 |
| 20 #include "config.h" | 20 #include "config.h" |
| 21 #include "core/layout/svg/SVGPathData.h" | 21 #include "core/layout/svg/SVGPathData.h" |
| 22 | 22 |
| 23 #include "core/SVGNames.h" | 23 #include "core/SVGNames.h" |
| 24 #include "core/layout/LayoutObject.h" | 24 #include "core/layout/LayoutObject.h" |
| 25 #include "core/layout/style/SVGLayoutStyle.h" | 25 #include "core/layout/style/SVGComputedStyle.h" |
| 26 #include "core/svg/SVGCircleElement.h" | 26 #include "core/svg/SVGCircleElement.h" |
| 27 #include "core/svg/SVGEllipseElement.h" | 27 #include "core/svg/SVGEllipseElement.h" |
| 28 #include "core/svg/SVGLineElement.h" | 28 #include "core/svg/SVGLineElement.h" |
| 29 #include "core/svg/SVGPathElement.h" | 29 #include "core/svg/SVGPathElement.h" |
| 30 #include "core/svg/SVGPathUtilities.h" | 30 #include "core/svg/SVGPathUtilities.h" |
| 31 #include "core/svg/SVGPolygonElement.h" | 31 #include "core/svg/SVGPolygonElement.h" |
| 32 #include "core/svg/SVGPolylineElement.h" | 32 #include "core/svg/SVGPolylineElement.h" |
| 33 #include "core/svg/SVGRectElement.h" | 33 #include "core/svg/SVGRectElement.h" |
| 34 #include "platform/graphics/Path.h" | 34 #include "platform/graphics/Path.h" |
| 35 #include "wtf/HashMap.h" | 35 #include "wtf/HashMap.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 using namespace SVGNames; | 39 using namespace SVGNames; |
| 40 | 40 |
| 41 static void updatePathFromCircleElement(SVGElement* element, Path& path) | 41 static void updatePathFromCircleElement(SVGElement* element, Path& path) |
| 42 { | 42 { |
| 43 ASSERT(element->layoutObject()); | 43 ASSERT(element->layoutObject()); |
| 44 | 44 |
| 45 SVGLengthContext lengthContext(element); | 45 SVGLengthContext lengthContext(element); |
| 46 const LayoutStyle& style = element->layoutObject()->styleRef(); | 46 const ComputedStyle& style = element->layoutObject()->styleRef(); |
| 47 float r = lengthContext.valueForLength(style.svgStyle().r(), style, SVGLengt
hMode::Other); | 47 float r = lengthContext.valueForLength(style.svgStyle().r(), style, SVGLengt
hMode::Other); |
| 48 if (r > 0) { | 48 if (r > 0) { |
| 49 path.addEllipse(FloatRect( | 49 path.addEllipse(FloatRect( |
| 50 lengthContext.valueForLength(style.svgStyle().cx(), style, SVGLength
Mode::Width) - r, | 50 lengthContext.valueForLength(style.svgStyle().cx(), style, SVGLength
Mode::Width) - r, |
| 51 lengthContext.valueForLength(style.svgStyle().cy(), style, SVGLength
Mode::Height) - r, | 51 lengthContext.valueForLength(style.svgStyle().cy(), style, SVGLength
Mode::Height) - r, |
| 52 r * 2, r * 2)); | 52 r * 2, r * 2)); |
| 53 } | 53 } |
| 54 } | 54 } |
| 55 | 55 |
| 56 static void updatePathFromEllipseElement(SVGElement* element, Path& path) | 56 static void updatePathFromEllipseElement(SVGElement* element, Path& path) |
| 57 { | 57 { |
| 58 ASSERT(element->layoutObject()); | 58 ASSERT(element->layoutObject()); |
| 59 | 59 |
| 60 SVGLengthContext lengthContext(element); | 60 SVGLengthContext lengthContext(element); |
| 61 const LayoutStyle& style = element->layoutObject()->styleRef(); | 61 const ComputedStyle& style = element->layoutObject()->styleRef(); |
| 62 float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, SVGLen
gthMode::Width); | 62 float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, SVGLen
gthMode::Width); |
| 63 if (rx < 0) | 63 if (rx < 0) |
| 64 return; | 64 return; |
| 65 float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, SVGLen
gthMode::Height); | 65 float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, SVGLen
gthMode::Height); |
| 66 if (ry < 0) | 66 if (ry < 0) |
| 67 return; | 67 return; |
| 68 if (!rx && !ry) | 68 if (!rx && !ry) |
| 69 return; | 69 return; |
| 70 | 70 |
| 71 path.addEllipse(FloatRect( | 71 path.addEllipse(FloatRect( |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 updatePathFromPolylineElement(element, path); | 109 updatePathFromPolylineElement(element, path); |
| 110 path.closeSubpath(); | 110 path.closeSubpath(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 static void updatePathFromRectElement(SVGElement* element, Path& path) | 113 static void updatePathFromRectElement(SVGElement* element, Path& path) |
| 114 { | 114 { |
| 115 SVGRectElement* rect = toSVGRectElement(element); | 115 SVGRectElement* rect = toSVGRectElement(element); |
| 116 ASSERT(rect->layoutObject()); | 116 ASSERT(rect->layoutObject()); |
| 117 | 117 |
| 118 SVGLengthContext lengthContext(element); | 118 SVGLengthContext lengthContext(element); |
| 119 const LayoutStyle& style = rect->layoutObject()->styleRef(); | 119 const ComputedStyle& style = rect->layoutObject()->styleRef(); |
| 120 float width = lengthContext.valueForLength(style.width(), style, SVGLengthMo
de::Width); | 120 float width = lengthContext.valueForLength(style.width(), style, SVGLengthMo
de::Width); |
| 121 if (width < 0) | 121 if (width < 0) |
| 122 return; | 122 return; |
| 123 float height = lengthContext.valueForLength(style.height(), style, SVGLength
Mode::Height); | 123 float height = lengthContext.valueForLength(style.height(), style, SVGLength
Mode::Height); |
| 124 if (height < 0) | 124 if (height < 0) |
| 125 return; | 125 return; |
| 126 if (!width && !height) | 126 if (!width && !height) |
| 127 return; | 127 return; |
| 128 | 128 |
| 129 float x = lengthContext.valueForLength(style.svgStyle().x(), style, SVGLengt
hMode::Width); | 129 float x = lengthContext.valueForLength(style.svgStyle().x(), style, SVGLengt
hMode::Width); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 map->set(polygonTag.localName().impl(), updatePathFromPolygonElement); | 161 map->set(polygonTag.localName().impl(), updatePathFromPolygonElement); |
| 162 map->set(polylineTag.localName().impl(), updatePathFromPolylineElement); | 162 map->set(polylineTag.localName().impl(), updatePathFromPolylineElement); |
| 163 map->set(rectTag.localName().impl(), updatePathFromRectElement); | 163 map->set(rectTag.localName().impl(), updatePathFromRectElement); |
| 164 } | 164 } |
| 165 | 165 |
| 166 if (PathUpdateFunction pathUpdateFunction = map->get(element->localName().im
pl())) | 166 if (PathUpdateFunction pathUpdateFunction = map->get(element->localName().im
pl())) |
| 167 (*pathUpdateFunction)(element, path); | 167 (*pathUpdateFunction)(element, path); |
| 168 } | 168 } |
| 169 | 169 |
| 170 } // namespace blink | 170 } // namespace blink |
| OLD | NEW |