| 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 27 matching lines...) Expand all Loading... |
| 38 } | 38 } |
| 39 | 39 |
| 40 void LayoutSVGResourceMarker::layout() | 40 void LayoutSVGResourceMarker::layout() |
| 41 { | 41 { |
| 42 ASSERT(needsLayout()); | 42 ASSERT(needsLayout()); |
| 43 if (m_isInLayout) | 43 if (m_isInLayout) |
| 44 return; | 44 return; |
| 45 | 45 |
| 46 TemporaryChange<bool> inLayoutChange(m_isInLayout, true); | 46 TemporaryChange<bool> inLayoutChange(m_isInLayout, true); |
| 47 | 47 |
| 48 // RenderSVGHiddenContainer overwrites layout(). We need the | 48 // LayoutSVGHiddenContainer overwrites layout(). We need the |
| 49 // layouting of LayoutSVGContainer for calculating local | 49 // layouting of LayoutSVGContainer for calculating local |
| 50 // transformations and paint invalidation. | 50 // transformations and paint invalidation. |
| 51 LayoutSVGContainer::layout(); | 51 LayoutSVGContainer::layout(); |
| 52 | 52 |
| 53 clearInvalidationMask(); | 53 clearInvalidationMask(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void LayoutSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation
) | 56 void LayoutSVGResourceMarker::removeAllClientsFromCache(bool markForInvalidation
) |
| 57 { | 57 { |
| 58 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval
idation : ParentOnlyInvalidation); | 58 markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInval
idation : ParentOnlyInvalidation); |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 SVGMarkerElement* marker = toSVGMarkerElement(element()); | 147 SVGMarkerElement* marker = toSVGMarkerElement(element()); |
| 148 ASSERT(marker); | 148 ASSERT(marker); |
| 149 | 149 |
| 150 SVGLengthContext lengthContext(marker); | 150 SVGLengthContext lengthContext(marker); |
| 151 float w = marker->markerWidth()->currentValue()->value(lengthContext); | 151 float w = marker->markerWidth()->currentValue()->value(lengthContext); |
| 152 float h = marker->markerHeight()->currentValue()->value(lengthContext); | 152 float h = marker->markerHeight()->currentValue()->value(lengthContext); |
| 153 m_viewport = FloatRect(0, 0, w, h); | 153 m_viewport = FloatRect(0, 0, w, h); |
| 154 } | 154 } |
| 155 | 155 |
| 156 } | 156 } |
| OLD | NEW |