[SVG] Resources should be laid out in dependecy order.

Source/core/rendering/svg/RenderSVGResourceContainer.cpp

 /*
  * Copyright (C) Research In Motion Limited 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #include "core/rendering/svg/RenderSVGResourceContainer.h"
 
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
-#include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/rendering/svg/SVGRenderingContext.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "core/svg/SVGGraphicsElement.h"
 
+#include "wtf/TemporaryChange.h"
+
 namespace WebCore {
 
 static inline SVGDocumentExtensions* svgExtensionsFromElement(SVGElement* element)
 {
     ASSERT(element);
     return element->document().accessSVGExtensions();
 }
 
 RenderSVGResourceContainer::RenderSVGResourceContainer(SVGElement* node)
     : RenderSVGHiddenContainer(node)
     , m_id(node->getIdAttribute())
     , m_registered(false)
     , m_isInvalidating(false)
+    , m_isInLayout(false)
 {
 }
 
 RenderSVGResourceContainer::~RenderSVGResourceContainer()
 {
     if (m_registered)
         svgExtensionsFromElement(element())->removeResource(m_id);
 }
 
 void RenderSVGResourceContainer::layout()
 {
+    if (!needsLayout() || m_isInLayout)

[pdr., 2013/09/23 22:26:02]

Should these be asserts?

[f(malita), 2013/09/23 23:20:33]

m_isInLayout is used for runtime layout cycle detection, so it cannot be
asserted.

We can probably turn the needsLayout() check into an assert though - we're only
calling layout() if needed.

+        return;
+
+    TemporaryChange<bool> inLayoutChange(m_isInLayout, true);
+
     // Invalidate all resources if our layout changed.
     if (everHadLayout() && selfNeedsLayout())
-        RenderSVGRoot::addResourceForClientInvalidation(this);
+        removeAllClientsFromCache();
 
     RenderSVGHiddenContainer::layout();
 }
 
 void RenderSVGResourceContainer::willBeDestroyed()
 {
     SVGResourcesCache::resourceDestroyed(this);
     RenderSVGHiddenContainer::willBeDestroyed();
 }
 
@@ skipping 156 matching lines @@
     if (!object->isSVGShape())
         return resourceTransform;
 
     SVGGraphicsElement* element = toSVGGraphicsElement(object->node());
     AffineTransform transform = element->getScreenCTM(SVGLocatable::DisallowStyleUpdate);
     transform *= resourceTransform;
     return transform;
 }
 
 }