Changeset 109104 in webkit

Timestamp:

Feb 28, 2012 8:01:19 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Percent width/height SVG not always scaled on window resize
​https://bugs.webkit.org/show_bug.cgi?id=79490

Patch by Florin Malita <​fmalita@google.com> on 2012-02-28
Reviewed by Nikolas Zimmermann.

Source/WebCore:

Tests: fast/repaint/percent-minheight-resize-expected.html

fast/repaint/percent-minheight-resize.html
svg/custom/svg-percent-scale-expected.html
svg/custom/svg-percent-scale-vonly-expected.html
svg/custom/svg-percent-scale-vonly.html
svg/custom/svg-percent-scale.html

Fix a couple of problems preventing correct SVG scaling on window resize:

• RenderReplaced::computePreferredLogicalWidths is not SVG attribute aware and computes

a non-zero m_minPreferredLogicalWidth even when the SVG widh/height are percentages.

• RenderBlock::layoutInlineChildren is also not SVG attribute aware and does not trigger

percent height child layouts on vertical-only resizes.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutInlineChildren):
Use hasRelativeDimensions() instead of direct width/height->isPercent tests. This also fixes
an HTML issue where percent {min,max}Height inline elements are not updated on vertical-only resizes.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::hasRelativeDimensions):
(WebCore):

• rendering/RenderBox.h:

(RenderBox):
Add virtual hasRelativeDimensions() method.

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::computePreferredLogicalWidths):
Use hasRelativeDimensions() instead of direct width/height->isPercent tests.

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
(WebCore::RenderSVGRoot::willBeDestroyed):
Register percent-height SVG elements with the gPercentHeightDescendantsMap, and clean-up on destruction
or height unit change.

(WebCore::RenderSVGRoot::hasRelativeDimensions):
(WebCore):

• rendering/svg/RenderSVGRoot.h:

(RenderSVGRoot):
SVG-aware hasRelativeDimensions() override.

LayoutTests:

• fast/repaint/percent-minheight-resize-expected.html: Added.
• fast/repaint/percent-minheight-resize.html: Added.
• svg/custom/svg-percent-scale-expected.html: Added.
• svg/custom/svg-percent-scale-vonly-expected.html: Added.
• svg/custom/svg-percent-scale-vonly.html: Added.
• svg/custom/svg-percent-scale.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/repaint/percent-minheight-resize-expected.html (added)
• LayoutTests/fast/repaint/percent-minheight-resize.html (added)
• LayoutTests/svg/custom/svg-percent-scale-expected.html (added)
• LayoutTests/svg/custom/svg-percent-scale-vonly-expected.html (added)
• LayoutTests/svg/custom/svg-percent-scale-vonly.html (added)
• LayoutTests/svg/custom/svg-percent-scale.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (1 diff)
• Source/WebCore/rendering/svg/RenderSVGRoot.cpp (modified) (3 diffs)
• Source/WebCore/rendering/svg/RenderSVGRoot.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-28  Florin Malita  <fmalita@google.com>
+
+        Percent width/height SVG not always scaled on window resize
+        https://bugs.webkit.org/show_bug.cgi?id=79490
+
+        Reviewed by Nikolas Zimmermann.
+
+        * fast/repaint/percent-minheight-resize-expected.html: Added.
+        * fast/repaint/percent-minheight-resize.html: Added.
+        * svg/custom/svg-percent-scale-expected.html: Added.
+        * svg/custom/svg-percent-scale-vonly-expected.html: Added.
+        * svg/custom/svg-percent-scale-vonly.html: Added.
+        * svg/custom/svg-percent-scale.html: Added.
+
 2012-02-28  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-28  Florin Malita  <fmalita@google.com>
+
+        Percent width/height SVG not always scaled on window resize
+        https://bugs.webkit.org/show_bug.cgi?id=79490
+
+        Reviewed by Nikolas Zimmermann.
+
+        Tests: fast/repaint/percent-minheight-resize-expected.html
+               fast/repaint/percent-minheight-resize.html
+               svg/custom/svg-percent-scale-expected.html
+               svg/custom/svg-percent-scale-vonly-expected.html
+               svg/custom/svg-percent-scale-vonly.html
+               svg/custom/svg-percent-scale.html
+
+        Fix a couple of problems preventing correct SVG scaling on window resize:
+
+        - RenderReplaced::computePreferredLogicalWidths is not SVG attribute aware and computes
+        a non-zero m_minPreferredLogicalWidth even when the SVG widh/height are percentages.
+
+        - RenderBlock::layoutInlineChildren is also not SVG attribute aware and does not trigger
+        percent height child layouts on vertical-only resizes.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+        Use hasRelativeDimensions() instead of direct width/height->isPercent tests. This also fixes
+        an HTML issue where percent {min,max}Height inline elements are not updated on vertical-only resizes.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::hasRelativeDimensions):
+        (WebCore):
+        * rendering/RenderBox.h:
+        (RenderBox):
+        Add virtual hasRelativeDimensions() method.
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::computePreferredLogicalWidths):
+        Use hasRelativeDimensions() instead of direct width/height->isPercent tests.
+
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::computeReplacedLogicalHeight):
+        (WebCore::RenderSVGRoot::willBeDestroyed):
+        Register percent-height SVG elements with the gPercentHeightDescendantsMap, and clean-up on destruction
+        or height unit change.
+
+        (WebCore::RenderSVGRoot::hasRelativeDimensions):
+        (WebCore):
+        * rendering/svg/RenderSVGRoot.h:
+        (RenderSVGRoot):
+        SVG-aware hasRelativeDimensions() override.
+
 2012-02-28  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1487 +1487 @@
                 RenderBox* box = toRenderBox(o);
 
-                if (relayoutChildren || o->style()->width().isPercent() || o->style()->height().isPercent())
+                if (relayoutChildren || box->hasRelativeDimensions())
                     o->setChildNeedsLayout(true, false);
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3961 +3961 @@
 }
 
+bool RenderBox::hasRelativeDimensions() const
+{
+    return style()->height().isPercent() || style()->width().isPercent()
+            || style()->maxHeight().isPercent() || style()->maxWidth().isPercent()
+            || style()->minHeight().isPercent() || style()->minWidth().isPercent();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBox.h

@@ -450 +450 @@
     IntSize scrolledContentOffset() const;
 
+    virtual bool hasRelativeDimensions() const;
+
 protected:
     virtual void willBeDestroyed();

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -441 +441 @@
         m_maxPreferredLogicalWidth = min(m_maxPreferredLogicalWidth, style()->maxWidth().value() + (style()->boxSizing() == CONTENT_BOX ? borderAndPadding : zeroLayoutUnit));
 
-    if (style()->width().isPercent() || style()->height().isPercent()
-        || style()->maxWidth().isPercent() || style()->maxHeight().isPercent()
-        || style()->minWidth().isPercent() || style()->minHeight().isPercent())
+    if (hasRelativeDimensions())
         m_minPreferredLogicalWidth = 0;
     else

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -189 +189 @@
         return RenderReplaced::computeReplacedLogicalHeight();
 
-    if (svg->heightAttributeEstablishesViewport())
-        return resolveLengthAttributeForSVG(svg->intrinsicHeight(SVGSVGElement::IgnoreCSSProperties), style()->effectiveZoom(), containingBlock()->availableLogicalHeight());
+    if (svg->heightAttributeEstablishesViewport()) {
+        Length height = svg->intrinsicHeight(SVGSVGElement::IgnoreCSSProperties);
+        if (height.isPercent()) {
+            RenderBlock* cb = containingBlock();
+            ASSERT(cb);
+            while (cb->isAnonymous()) {
+                cb = cb->containingBlock();
+                cb->addPercentHeightDescendant(const_cast<RenderSVGRoot*>(this));
+            }
+        } else
+            RenderBlock::removePercentHeightDescendant(const_cast<RenderSVGRoot*>(this));
+
+        return resolveLengthAttributeForSVG(height, style()->effectiveZoom(), containingBlock()->availableLogicalHeight());
+    }
 
     // Only SVGs embedded in <object> reach this point.
@@ -276 +288 @@
 void RenderSVGRoot::willBeDestroyed()
 {
+    RenderBlock::removePercentHeightDescendant(const_cast<RenderSVGRoot*>(this));
+
     SVGResourcesCache::clientDestroyed(this);
     RenderReplaced::willBeDestroyed();
@@ -402 +416 @@
 }
 
+bool RenderSVGRoot::hasRelativeDimensions() const
+{
+    SVGSVGElement* svg = static_cast<SVGSVGElement*>(node());
+    ASSERT(svg);
+
+    return svg->intrinsicHeight(SVGSVGElement::IgnoreCSSProperties).isPercent() || svg->intrinsicWidth(SVGSVGElement::IgnoreCSSProperties).isPercent();
+}
+
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

@@ -53 +53 @@
     IntSize containerSize() const { return m_containerSize; }
     void setContainerSize(const IntSize& containerSize) { m_containerSize = containerSize; }
+
+    virtual bool hasRelativeDimensions() const;
 
 private: