Changeset 26075 in webkit

Timestamp:

Oct 5, 2007 5:56:52 PM (17 years ago)

Author:

eseidel

Message:

2007-10-05 Eric Seidel <​eric@webkit.org>

Reviewed by Oliver Hunt.

SVG invalidates way too much during layout()
​http://bugs.webkit.org/show_bug.cgi?id=14003

• ksvg2/svg/SVGElement.cpp: (WebCore::SVGElement::ownerSVGElement): simplify if (WebCore::SVGElement::viewportElement): simplify if
• rendering/RenderSVGContainer.cpp: (WebCore::RenderSVGContainer::layout): only layout children if parent changed
• rendering/RenderSVGRoot.cpp: (WebCore::RenderSVGRoot::layout): only layout children when size changes
• rendering/RenderSVGText.cpp: (WebCore::RenderSVGText::layout): hack to avoid bad RenderBlock::layout code
• rendering/RenderSVGViewportContainer.cpp: (WebCore::RenderSVGViewportContainer::layout): don't use RenderSVGContainer::layout()

Location:

branches/feature-branch/WebCore

Files:

• ChangeLog (modified) (1 diff)
• ksvg2/svg/SVGElement.cpp (modified) (2 diffs)
• rendering/RenderSVGContainer.cpp (modified) (3 diffs)
• rendering/RenderSVGRoot.cpp (modified) (2 diffs)
• rendering/RenderSVGText.cpp (modified) (1 diff)
• rendering/RenderSVGViewportContainer.cpp (modified) (2 diffs)

branches/feature-branch/WebCore/ChangeLog

@@ +1 @@
+2007-10-05  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        SVG invalidates way too much during layout()
+        http://bugs.webkit.org/show_bug.cgi?id=14003
+
+        * ksvg2/svg/SVGElement.cpp:
+        (WebCore::SVGElement::ownerSVGElement): simplify if
+        (WebCore::SVGElement::viewportElement): simplify if
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::layout): only layout children if parent changed
+        * rendering/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::layout): only layout children when size changes
+        * rendering/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::layout): hack to avoid bad RenderBlock::layout code
+        * rendering/RenderSVGViewportContainer.cpp:
+        (WebCore::RenderSVGViewportContainer::layout): don't use RenderSVGContainer::layout()
+
 2007-10-05  Oliver Hunt  <oliver@apple.com>
 

branches/feature-branch/WebCore/ksvg2/svg/SVGElement.cpp

@@ -89 +89 @@
     Node* n = parentNode();
     while (n) {
-        if (n->nodeType() == ELEMENT_NODE && n->hasTagName(SVGNames::svgTag))
+        if (n->hasTagName(SVGNames::svgTag))
             return static_cast<SVGSVGElement*>(n);
 
@@ -104 +104 @@
     Node* n = isShadowNode() ? const_cast<SVGElement*>(this)->shadowParentNode() : parentNode();
     while (n) {
-        if (n->isElementNode() &&
-            (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::symbolTag)))
+        if (n->hasTagName(SVGNames::svgTag) || n->hasTagName(SVGNames::imageTag) || n->hasTagName(SVGNames::symbolTag))
             return static_cast<SVGElement*>(n);
 

branches/feature-branch/WebCore/rendering/RenderSVGContainer.cpp

@@ -235 +235 @@
     IntRect oldOutlineBox;
     bool checkForRepaint = checkForRepaintDuringLayout();
-    if (selfNeedsLayout() && checkForRepaint) {
+    if (checkForRepaint) {
         oldBounds = m_absoluteBounds;
         oldOutlineBox = absoluteOutlineBox();
@@ -242 +242 @@
     RenderObject* child = firstChild();
     while (child) {
-        // FIXME: This check is bogus, see http://bugs.webkit.org/show_bug.cgi?id=14003
-        if (!child->isRenderPath() || static_cast<RenderPath*>(child)->hasRelativeValues())
+        // Only force our kids to layout if we're being asked to relayout as a result of a parent changing
+        if (selfNeedsLayout() && (!child->isRenderPath() || static_cast<RenderPath*>(child)->hasRelativeValues()))
             child->setNeedsLayout(true);
 
@@ -256 +256 @@
     m_absoluteBounds = absoluteClippedOverflowRect();
 
-    if (selfNeedsLayout() && checkForRepaint)
+    if (checkForRepaint)
         repaintAfterLayoutIfNeeded(oldBounds, oldOutlineBox);
 

branches/feature-branch/WebCore/rendering/RenderSVGRoot.cpp

@@ -71 +71 @@
     view()->disableLayoutState();
 
-    IntRect oldBounds;
+    IntRect oldBounds = m_absoluteBounds;
     IntRect oldOutlineBox;
     bool checkForRepaint = checkForRepaintDuringLayout();
-    if (selfNeedsLayout() && checkForRepaint) {
-        oldBounds = m_absoluteBounds;
+    if (selfNeedsLayout() && checkForRepaint)
         oldOutlineBox = absoluteOutlineBox();
-    }
-
-    RenderObject* child = firstChild();
-    while (child) {
-        // FIXME: This check is bogus, see http://bugs.webkit.org/show_bug.cgi?id=14003
-        if (!child->isRenderPath() || static_cast<RenderPath*>(child)->hasRelativeValues())
-            child->setNeedsLayout(true);
-
-        child->layoutIfNeeded();
-        ASSERT(!child->needsLayout());
-        child = child->nextSibling();
-    }
 
     calcWidth();
@@ -97 +84 @@
     m_width = m_width * svg->currentScale();
     m_height = m_height * svg->currentScale();
+    
+    bool boundsChanged = m_absoluteBounds != oldBounds;
+    
+    if (boundsChanged || normalChildNeedsLayout() || posChildNeedsLayout()) {
+        for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+            if (boundsChanged && (!child->isRenderPath() || static_cast<RenderPath*>(child)->hasRelativeValues()))
+                child->setNeedsLayout(true);
+            
+            child->layoutIfNeeded();
+            ASSERT(!child->needsLayout());
+        }
+    }
 
     if (selfNeedsLayout() && checkForRepaint)

branches/feature-branch/WebCore/rendering/RenderSVGText.cpp

@@ -71 +71 @@
 {
     ASSERT(needsLayout());
+    
+    // FIXME: This is a hack to avoid the RenderBlock::layout() partial repainting code which is not (yet) SVG aware
+    setNeedsLayout(true);
 
     IntRect oldBounds;

branches/feature-branch/WebCore/rendering/RenderSVGViewportContainer.cpp

@@ -28 +28 @@
 
 #include "GraphicsContext.h"
+
+#include "RenderView.h"
 #include "SVGMarkerElement.h"
 #include "SVGSVGElement.h"
@@ -45 +47 @@
 void RenderSVGViewportContainer::layout()
 {
+    ASSERT(needsLayout());
+    
     calcViewport();
-    RenderSVGContainer::layout();
+    
+    // Arbitrary affine transforms are incompatible with LayoutState.
+    view()->disableLayoutState();
+    
+    IntRect oldBounds = m_absoluteBounds;
+    IntRect oldOutlineBox;
+    bool checkForRepaint = checkForRepaintDuringLayout();
+    if (selfNeedsLayout() && checkForRepaint)
+        oldOutlineBox = absoluteOutlineBox();
+    
+    calcWidth();
+    
+    m_absoluteBounds = absoluteClippedOverflowRect();
+    bool boundsChanged = m_absoluteBounds != oldBounds;
+    
+    if (boundsChanged || normalChildNeedsLayout() || posChildNeedsLayout()) {
+        for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+            if (boundsChanged && (!child->isRenderPath() || static_cast<RenderPath*>(child)->hasRelativeValues()))
+                child->setNeedsLayout(true);
+            
+            child->layoutIfNeeded();
+            ASSERT(!child->needsLayout());
+        }
+    }
+    
+    if (selfNeedsLayout() && checkForRepaint)
+        repaintAfterLayoutIfNeeded(oldBounds, oldOutlineBox);
+    
+    view()->enableLayoutState();
+    setNeedsLayout(false);
 }