| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2009 Google, Inc. | 5 * Copyright (C) 2009 Google, Inc. |
| 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 // SVG embedded through object/embed/iframe. | 188 // SVG embedded through object/embed/iframe. |
| 189 if (isEmbeddedThroughFrameContainingSVGDocument()) | 189 if (isEmbeddedThroughFrameContainingSVGDocument()) |
| 190 return document()->frame()->ownerRenderer()->availableLogicalHeight(Incl
udeMarginBorderPadding); | 190 return document()->frame()->ownerRenderer()->availableLogicalHeight(Incl
udeMarginBorderPadding); |
| 191 | 191 |
| 192 // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SV
G. | 192 // SVG embedded via SVGImage (background-image/border-image/etc) / Inline SV
G. |
| 193 return RenderReplaced::computeReplacedLogicalHeight(); | 193 return RenderReplaced::computeReplacedLogicalHeight(); |
| 194 } | 194 } |
| 195 | 195 |
| 196 void RenderSVGRoot::layout() | 196 void RenderSVGRoot::layout() |
| 197 { | 197 { |
| 198 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 199 ASSERT(needsLayout()); | 198 ASSERT(needsLayout()); |
| 200 | 199 |
| 201 m_resourcesNeedingToInvalidateClients.clear(); | 200 m_resourcesNeedingToInvalidateClients.clear(); |
| 202 | 201 |
| 203 // Arbitrary affine transforms are incompatible with LayoutState. | 202 // Arbitrary affine transforms are incompatible with LayoutState. |
| 204 LayoutStateDisabler layoutStateDisabler(view()); | 203 LayoutStateDisabler layoutStateDisabler(view()); |
| 205 | 204 |
| 206 bool needsLayout = selfNeedsLayout(); | 205 bool needsLayout = selfNeedsLayout(); |
| 207 LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && needsLayou
t); | 206 LayoutRepainter repainter(*this, checkForRepaintDuringLayout() && needsLayou
t); |
| 208 | 207 |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 { | 479 { |
| 481 RenderObject* svgRoot = resource->parent(); | 480 RenderObject* svgRoot = resource->parent(); |
| 482 while (svgRoot && !svgRoot->isSVGRoot()) | 481 while (svgRoot && !svgRoot->isSVGRoot()) |
| 483 svgRoot = svgRoot->parent(); | 482 svgRoot = svgRoot->parent(); |
| 484 if (!svgRoot) | 483 if (!svgRoot) |
| 485 return; | 484 return; |
| 486 toRenderSVGRoot(svgRoot)->m_resourcesNeedingToInvalidateClients.add(resource
); | 485 toRenderSVGRoot(svgRoot)->m_resourcesNeedingToInvalidateClients.add(resource
); |
| 487 } | 486 } |
| 488 | 487 |
| 489 } | 488 } |
| OLD | NEW |