OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010. 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 extensions.addResource(m_id, this); | 220 extensions.addResource(m_id, this); |
221 | 221 |
222 // Update cached resources of pending clients. | 222 // Update cached resources of pending clients. |
223 const SVGDocumentExtensions::SVGPendingElements::const_iterator end = client
s->end(); | 223 const SVGDocumentExtensions::SVGPendingElements::const_iterator end = client
s->end(); |
224 for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients-
>begin(); it != end; ++it) { | 224 for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients-
>begin(); it != end; ++it) { |
225 ASSERT((*it)->hasPendingResources()); | 225 ASSERT((*it)->hasPendingResources()); |
226 extensions.clearHasPendingResourcesIfPossible(*it); | 226 extensions.clearHasPendingResourcesIfPossible(*it); |
227 RenderObject* renderer = (*it)->renderer(); | 227 RenderObject* renderer = (*it)->renderer(); |
228 if (!renderer) | 228 if (!renderer) |
229 continue; | 229 continue; |
230 SVGResourcesCache::clientStyleChanged(renderer, StyleDifferenceLayout, r
enderer->style()); | 230 |
| 231 StyleDifference diff; |
| 232 diff.setNeedsFullLayout(); |
| 233 SVGResourcesCache::clientStyleChanged(renderer, diff, renderer->style())
; |
231 renderer->setNeedsLayout(); | 234 renderer->setNeedsLayout(); |
232 } | 235 } |
233 } | 236 } |
234 | 237 |
235 AffineTransform RenderSVGResourceContainer::computeResourceSpaceTransform(Render
Object* object, const AffineTransform& baseTransform, const SVGRenderStyle* svgS
tyle, unsigned short resourceMode) | 238 AffineTransform RenderSVGResourceContainer::computeResourceSpaceTransform(Render
Object* object, const AffineTransform& baseTransform, const SVGRenderStyle* svgS
tyle, unsigned short resourceMode) |
236 { | 239 { |
237 AffineTransform computedSpaceTransform = baseTransform; | 240 AffineTransform computedSpaceTransform = baseTransform; |
238 if (resourceMode & ApplyToTextMode) { | 241 if (resourceMode & ApplyToTextMode) { |
239 // Depending on the font scaling factor, we may need to apply an | 242 // Depending on the font scaling factor, we may need to apply an |
240 // additional transform (scale-factor) the paintserver, since text | 243 // additional transform (scale-factor) the paintserver, since text |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 if (!object->isSVGShape()) | 278 if (!object->isSVGShape()) |
276 return resourceTransform; | 279 return resourceTransform; |
277 | 280 |
278 SVGGraphicsElement* element = toSVGGraphicsElement(object->node()); | 281 SVGGraphicsElement* element = toSVGGraphicsElement(object->node()); |
279 AffineTransform transform = element->getScreenCTM(SVGGraphicsElement::Disall
owStyleUpdate); | 282 AffineTransform transform = element->getScreenCTM(SVGGraphicsElement::Disall
owStyleUpdate); |
280 transform *= resourceTransform; | 283 transform *= resourceTransform; |
281 return transform; | 284 return transform; |
282 } | 285 } |
283 | 286 |
284 } | 287 } |
OLD | NEW |