OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010-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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 if (dyList) | 172 if (dyList) |
173 data.dy = dyList->at(i).value(lengthContext); | 173 data.dy = dyList->at(i).value(lengthContext); |
174 if (rotateList) { | 174 if (rotateList) { |
175 data.rotate = rotateList->at(i); | 175 data.rotate = rotateList->at(i); |
176 lastRotation = data.rotate; | 176 lastRotation = data.rotate; |
177 } | 177 } |
178 } | 178 } |
179 | 179 |
180 void SVGTextLayoutAttributesBuilder::fillCharacterDataMap(const TextPosition& po
sition) | 180 void SVGTextLayoutAttributesBuilder::fillCharacterDataMap(const TextPosition& po
sition) |
181 { | 181 { |
182 const SVGLengthList& xList = position.element->x(); | 182 const SVGLengthList& xList = position.element->xCurrentValue(); |
183 const SVGLengthList& yList = position.element->y(); | 183 const SVGLengthList& yList = position.element->yCurrentValue(); |
184 const SVGLengthList& dxList = position.element->dx(); | 184 const SVGLengthList& dxList = position.element->dxCurrentValue(); |
185 const SVGLengthList& dyList = position.element->dy(); | 185 const SVGLengthList& dyList = position.element->dyCurrentValue(); |
186 const SVGNumberList& rotateList = position.element->rotate(); | 186 const SVGNumberList& rotateList = position.element->rotateCurrentValue(); |
187 | 187 |
188 unsigned xListSize = xList.size(); | 188 unsigned xListSize = xList.size(); |
189 unsigned yListSize = yList.size(); | 189 unsigned yListSize = yList.size(); |
190 unsigned dxListSize = dxList.size(); | 190 unsigned dxListSize = dxList.size(); |
191 unsigned dyListSize = dyList.size(); | 191 unsigned dyListSize = dyList.size(); |
192 unsigned rotateListSize = rotateList.size(); | 192 unsigned rotateListSize = rotateList.size(); |
193 if (!xListSize && !yListSize && !dxListSize && !dyListSize && !rotateListSiz
e) | 193 if (!xListSize && !yListSize && !dxListSize && !dyListSize && !rotateListSiz
e) |
194 return; | 194 return; |
195 | 195 |
196 float lastRotation = SVGTextLayoutAttributes::emptyValue(); | 196 float lastRotation = SVGTextLayoutAttributes::emptyValue(); |
(...skipping 29 matching lines...) Expand all Loading... |
226 data.rotate = lastRotation; | 226 data.rotate = lastRotation; |
227 m_characterDataMap.set(position.start + i + 1, data); | 227 m_characterDataMap.set(position.start + i + 1, data); |
228 continue; | 228 continue; |
229 } | 229 } |
230 | 230 |
231 it->value.rotate = lastRotation; | 231 it->value.rotate = lastRotation; |
232 } | 232 } |
233 } | 233 } |
234 | 234 |
235 } | 235 } |
OLD | NEW |