Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1568)

Unified Diff: Source/core/rendering/svg/SVGRenderSupport.cpp

Issue 23785014: [SVG] Resources should be laid out in dependecy order. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: text-layout-crash.html needs image result update. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/svg/SVGRenderSupport.h ('k') | Source/core/rendering/svg/SVGResources.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/SVGRenderSupport.cpp
diff --git a/Source/core/rendering/svg/SVGRenderSupport.cpp b/Source/core/rendering/svg/SVGRenderSupport.cpp
index 1e4864989a54d3a64bd413a2b616e0ee71fdd1e6..ad9d5ffeb3b75674eba4a16409fb869461801b63 100644
--- a/Source/core/rendering/svg/SVGRenderSupport.cpp
+++ b/Source/core/rendering/svg/SVGRenderSupport.cpp
@@ -242,9 +242,15 @@ void SVGRenderSupport::layoutChildren(RenderObject* start, bool selfNeedsLayout)
}
SubtreeLayoutScope layoutScope(child);
- if (needsLayout)
+ // Resource containers are nasty: they can invalidate clients outside the current SubtreeLayoutScope.
+ // Since they only care about viewport size changes (to resolve their relative lengths), we trigger
+ // their invalidation directly from SVGSVGElement::svgAttributeChange() or at a higher
+ // SubtreeLayoutScope (in RenderView::layout()).
+ if (needsLayout && !child->isSVGResourceContainer())
layoutScope.setNeedsLayout(child);
+ layoutResourcesIfNeeded(child);
+
if (child->needsLayout()) {
child->layout();
// Renderers are responsible for repainting themselves when changing, except
@@ -268,6 +274,15 @@ void SVGRenderSupport::layoutChildren(RenderObject* start, bool selfNeedsLayout)
invalidateResourcesOfChildren(*it);
}
+void SVGRenderSupport::layoutResourcesIfNeeded(const RenderObject* object)
+{
+ ASSERT(object);
+
+ SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object);
+ if (resources)
+ resources->layoutIfNeeded();
+}
+
bool SVGRenderSupport::isOverflowHidden(const RenderObject* object)
{
// SVG doesn't support independent x/y overflow
« no previous file with comments | « Source/core/rendering/svg/SVGRenderSupport.h ('k') | Source/core/rendering/svg/SVGResources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698