| 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 |
| (...skipping 98 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 float width = rect->width()->currentValue()->value(lengthContext); | 119 const LayoutStyle& style = rect->layoutObject()->styleRef(); |
| 120 float width = lengthContext.valueForLength(style.width(), style, SVGLengthMo
de::Width); |
| 120 if (width < 0) | 121 if (width < 0) |
| 121 return; | 122 return; |
| 122 float height = rect->height()->currentValue()->value(lengthContext); | 123 float height = lengthContext.valueForLength(style.height(), style, SVGLength
Mode::Height); |
| 123 if (height < 0) | 124 if (height < 0) |
| 124 return; | 125 return; |
| 125 if (!width && !height) | 126 if (!width && !height) |
| 126 return; | 127 return; |
| 127 | 128 |
| 128 const LayoutStyle& style = rect->layoutObject()->styleRef(); | |
| 129 float x = lengthContext.valueForLength(style.svgStyle().x(), style, SVGLengt
hMode::Width); | 129 float x = lengthContext.valueForLength(style.svgStyle().x(), style, SVGLengt
hMode::Width); |
| 130 float y = lengthContext.valueForLength(style.svgStyle().y(), style, SVGLengt
hMode::Height); | 130 float y = lengthContext.valueForLength(style.svgStyle().y(), style, SVGLengt
hMode::Height); |
| 131 float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, SVGLen
gthMode::Width); | 131 float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, SVGLen
gthMode::Width); |
| 132 float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, SVGLen
gthMode::Height); | 132 float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, SVGLen
gthMode::Height); |
| 133 bool hasRx = rx > 0; | 133 bool hasRx = rx > 0; |
| 134 bool hasRy = ry > 0; | 134 bool hasRy = ry > 0; |
| 135 if (hasRx || hasRy) { | 135 if (hasRx || hasRy) { |
| 136 if (!hasRx) | 136 if (!hasRx) |
| 137 rx = ry; | 137 rx = ry; |
| 138 else if (!hasRy) | 138 else if (!hasRy) |
| (...skipping 22 matching lines...) Expand all 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 |