[SVG] Skip layout viewport change calculation when not needed.

Source/core/rendering/svg/SVGRenderSupport.cpp

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 139 matching lines @@
 const RenderSVGRoot* SVGRenderSupport::findTreeRootObject(const RenderObject* start)
 {
     while (start && !start->isSVGRoot())
         start = start->parent();
 
     ASSERT(start);
     ASSERT(start->isSVGRoot());
     return toRenderSVGRoot(start);
 }
 
-inline void SVGRenderSupport::invalidateResourcesOfChildren(RenderObject* start)
-{
-    ASSERT(!start->needsLayout());
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(start))
-        resources->removeClientFromCache(start, false);
-
-    for (RenderObject* child = start->slowFirstChild(); child; child = child->nextSibling())
-        invalidateResourcesOfChildren(child);
-}
-
 inline bool SVGRenderSupport::layoutSizeOfNearestViewportChanged(const RenderObject* start)
 {
     while (start && !start->isSVGRoot() && !start->isSVGViewportContainer())
         start = start->parent();
 
     ASSERT(start);
     ASSERT(start->isSVGRoot() || start->isSVGViewportContainer());
     if (start->isSVGViewportContainer())
         return toRenderSVGViewportContainer(start)->isLayoutSizeChanged();
 
     return toRenderSVGRoot(start)->isLayoutSizeChanged();
 }
 
 bool SVGRenderSupport::transformToRootChanged(RenderObject* ancestor)
 {
     while (ancestor && !ancestor->isSVGRoot()) {
         if (ancestor->isSVGTransformableContainer())
             return toRenderSVGContainer(ancestor)->didTransformToRootUpdate();
         if (ancestor->isSVGViewportContainer())
             return toRenderSVGViewportContainer(ancestor)->didTransformToRootUpdate();
         ancestor = ancestor->parent();
     }
 
     return false;
 }
 
 void SVGRenderSupport::layoutChildren(RenderObject* start, bool selfNeedsLayout)
 {
-    bool layoutSizeChanged = layoutSizeOfNearestViewportChanged(start);
+    // When hasRelativeLengths() is false, no descendants have relative lengths
+    // (hence no one is interested in viewport size changes).
+    bool layoutSizeChanged = toSVGElement(start->node())->hasRelativeLengths()
+        && layoutSizeOfNearestViewportChanged(start);
     bool transformChanged = transformToRootChanged(start);
-    HashSet<RenderObject*> notlayoutedObjects;
 
     for (RenderObject* child = start->slowFirstChild(); child; child = child->nextSibling()) {
-        bool needsLayout = selfNeedsLayout;
+        bool forceLayout = selfNeedsLayout;
 
         if (transformChanged) {
             // If the transform changed we need to update the text metrics (note: this also happens for layoutSizeChanged=true).
             if (child->isSVGText())
                 toRenderSVGText(child)->setNeedsTextMetricsUpdate();
-            needsLayout = true;
+            forceLayout = true;
         }
 
         if (layoutSizeChanged) {
             // When selfNeedsLayout is false and the layout size changed, we have to check whether this child uses relative lengths
             if (SVGElement* element = child->node()->isSVGElement() ? toSVGElement(child->node()) : 0) {
                 if (element->hasRelativeLengths()) {
+                    // FIXME: this should be done on invalidation, not during layout.
                     // When the layout size changed and when using relative values tell the RenderSVGShape to update its shape object
                     if (child->isSVGShape()) {
                         toRenderSVGShape(child)->setNeedsShapeUpdate();
                     } else if (child->isSVGText()) {
                         toRenderSVGText(child)->setNeedsTextMetricsUpdate();
                         toRenderSVGText(child)->setNeedsPositioningValuesUpdate();
                     }
 
-                    needsLayout = true;
+                    forceLayout = true;
                 }
             }
         }
 
         SubtreeLayoutScope layoutScope(*child);
         // 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())
+        if (forceLayout && !child->isSVGResourceContainer())
             layoutScope.setNeedsLayout(child);
 
+        // Lay out any referenced resources before the child.
         layoutResourcesIfNeeded(child);
-
-        if (child->needsLayout()) {
-            child->layout();
-        } else if (layoutSizeChanged) {
-            notlayoutedObjects.add(child);
-        }
+        child->layoutIfNeeded();
     }
-
-    if (!layoutSizeChanged) {
-        ASSERT(notlayoutedObjects.isEmpty());
-        return;
-    }
-
-    // If the layout size changed, invalidate all resources of all children that didn't go through the layout() code path.
-    HashSet<RenderObject*>::iterator end = notlayoutedObjects.end();
-    for (HashSet<RenderObject*>::iterator it = notlayoutedObjects.begin(); it != end; ++it)
-        invalidateResourcesOfChildren(*it);
 }
 
 void SVGRenderSupport::layoutResourcesIfNeeded(const RenderObject* object)
 {
     ASSERT(object);
 
     SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object);
     if (resources)
         resources->layoutIfNeeded();
 }
@@ skipping 120 matching lines @@
 }
 
 bool SVGRenderSupport::isRenderableTextNode(const RenderObject* object)
 {
     ASSERT(object->isText());
     // <br> is marked as text, but is not handled by the SVG rendering code-path.
     return object->isSVGInlineText() && !toRenderSVGInlineText(object)->hasEmptyText();
 }
 
 }