Changeset 28856 in webkit

Timestamp:

Dec 18, 2007 11:53:52 PM (16 years ago)

Author:

Beth Dakin

Message:

WebCore:

Reviewed by Oliver.

Fix for <rdar://problem/5616982> SVGs with width and height 100%
fail to render when used as <img> or CSS image (16167)

This final part of the work fixes the <img> tag.

This is the real fix.

• rendering/RenderImage.cpp: (WebCore::RenderImage::calcReplacedWidth): Set the container size on the image. Setting the container size only actually sticks if the values are non-zero, so if the container size really was set, use the imageSize that is calculated using the container size. If it did not stick but the image does have relative width (meaning that the container size is 0), set the width to 0 by hand. We want to avoid setting the width before we have a container size or we will end up incorrectly using the default size of 300x150. (WebCore::RenderImage::calcReplacedHeight): Same as above, but for height.

A few more pieces of information have to be exposed through cached
image to make this happen.

• loader/CachedImage.cpp: (WebCore::CachedImage::usesImageContainerSize): As mentioned above, when setContainerSize() is called, the container size is only actually set if the values are non-zero. This call tells you if it was set. (WebCore::CachedImage::imageHasRelativeWidth): (WebCore::CachedImage::imageHasRelativeHeight):
• loader/CachedImage.h:
• platform/graphics/Image.h: (WebCore::Image::usesContainerSize):
• svg/graphics/SVGImage.cpp: (WebCore::SVGImage::usesContainerSize):
• svg/graphics/SVGImage.h:

LayoutTests:

Reviewed by Oliver.

Test for <rdar://problem/5616982> SVGs with width and height 100%
fail to render when used as <img> or CSS image (16167)

• fast/images/resources/green-relative-size-rect.svg: Added.
• fast/images/svg-as-relative-image.html: Added.
• platform/mac/fast/images/svg-as-relative-image-expected.checksum: Added.
• platform/mac/fast/images/svg-as-relative-image-expected.png: Added.
• platform/mac/fast/images/svg-as-relative-image-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/resources/green-relative-size-rect.svg (added)
• LayoutTests/fast/images/svg-as-relative-image.html (added)
• LayoutTests/platform/mac/fast/images/svg-as-relative-image-expected.checksum (added)
• LayoutTests/platform/mac/fast/images/svg-as-relative-image-expected.png (added)
• LayoutTests/platform/mac/fast/images/svg-as-relative-image-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/CachedImage.cpp (modified) (1 diff)
• WebCore/loader/CachedImage.h (modified) (1 diff)
• WebCore/platform/graphics/Image.h (modified) (1 diff)
• WebCore/rendering/RenderImage.cpp (modified) (2 diffs)
• WebCore/svg/graphics/SVGImage.cpp (modified) (1 diff)
• WebCore/svg/graphics/SVGImage.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Oliver.
+
+        Test for <rdar://problem/5616982> SVGs with width and height 100% 
+        fail to render when used as <img> or CSS image (16167)
+
+        * fast/images/resources/green-relative-size-rect.svg: Added.
+        * fast/images/svg-as-relative-image.html: Added.
+        * platform/mac/fast/images/svg-as-relative-image-expected.checksum: Added.
+        * platform/mac/fast/images/svg-as-relative-image-expected.png: Added.
+        * platform/mac/fast/images/svg-as-relative-image-expected.txt: Added.
+
 2007-12-18  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-18  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Oliver.
+
+        Fix for <rdar://problem/5616982> SVGs with width and height 100% 
+        fail to render when used as <img> or CSS image (16167)
+
+        This final part of the work fixes the <img> tag.
+
+        This is the real fix. 
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::calcReplacedWidth): Set the container size 
+        on the image. Setting the container size only actually sticks if 
+        the values are non-zero, so if the container size really was set, 
+        use the imageSize that is calculated using the container size. If 
+        it did not stick but the image does have relative width (meaning 
+        that the container size is 0), set the width to 0 by hand. We want 
+        to avoid setting the width before we have a container size or we 
+        will end up incorrectly using the default size of 300x150.
+        (WebCore::RenderImage::calcReplacedHeight): Same as above, but for 
+        height.
+
+        A few more pieces of information have to be exposed through cached 
+        image to make this happen.
+        * loader/CachedImage.cpp:
+        (WebCore::CachedImage::usesImageContainerSize): As mentioned above, 
+        when setContainerSize() is called, the container size is only 
+        actually set if the values are non-zero. This call tells you if it 
+        was set.
+        (WebCore::CachedImage::imageHasRelativeWidth):
+        (WebCore::CachedImage::imageHasRelativeHeight):
+        * loader/CachedImage.h:
+        * platform/graphics/Image.h:
+        (WebCore::Image::usesContainerSize):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::usesContainerSize):
+        * svg/graphics/SVGImage.h:
+
 2007-12-18  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/loader/CachedImage.cpp

@@ -118 +118 @@
     if (m_image)
         m_image->setContainerSize(containerSize);
+}
+
+bool CachedImage::usesImageContainerSize() const
+{
+    if (m_image)
+        return m_image->usesContainerSize();
+
+    return false;
+}
+
+bool CachedImage::imageHasRelativeWidth() const
+{
+    if (m_image)
+        return m_image->hasRelativeWidth();
+
+    return false;
+}
+
+bool CachedImage::imageHasRelativeHeight() const
+{
+    if (m_image)
+        return m_image->hasRelativeHeight();
+
+    return false;
 }
 

trunk/WebCore/loader/CachedImage.h

@@ -47 +47 @@
     bool canRender() const { return !errorOccurred() && imageSize().width() > 0 && imageSize().height() > 0; }
 
+    // These are ony used for SVGImage right now
     void setImageContainerSize(const IntSize&);
+    bool usesImageContainerSize() const;
+    bool imageHasRelativeWidth() const;
+    bool imageHasRelativeHeight() const;
     
     IntSize imageSize() const;  // returns the size of the complete image

trunk/WebCore/platform/graphics/Image.h

@@ -83 +83 @@
     // These are ony used for SVGImage right now
     virtual void setContainerSize(const IntSize&) { }
+    virtual bool usesContainerSize() const { return false; }
     virtual bool hasRelativeWidth() const { return false; }
     virtual bool hasRelativeHeight() const { return false; }

trunk/WebCore/rendering/RenderImage.cpp

@@ -325 +325 @@
 int RenderImage::calcReplacedWidth() const
 {
+    if (m_cachedImage && m_cachedImage->imageHasRelativeWidth() && !m_cachedImage->usesImageContainerSize())
+        if (RenderObject* cb = isPositioned() ? container() : containingBlock())
+            m_cachedImage->setImageContainerSize(IntSize(cb->availableWidth(), cb->availableHeight()));
+    
     int width;
     if (isWidthSpecified())
         width = calcReplacedWidthUsing(style()->width());
+    else if (m_cachedImage && m_cachedImage->usesImageContainerSize())
+        width = m_cachedImage->imageSize().width();
+    else if (m_cachedImage && m_cachedImage->imageHasRelativeWidth())
+        width = 0; // If the image is relatively-sized, set the width to 0 until there is a set container size.
     else
         width = calcAspectRatioWidth();
@@ -342 +350 @@
     if (isHeightSpecified())
         height = calcReplacedHeightUsing(style()->height());
+    else if (m_cachedImage && m_cachedImage->usesImageContainerSize())
+        height = m_cachedImage->imageSize().height();
+    else if (m_cachedImage && m_cachedImage->imageHasRelativeHeight())
+        height = 0; // If the image is relatively-sized, set the height to 0 until there is a set container size.
     else
         height = calcAspectRatioHeight();

trunk/WebCore/svg/graphics/SVGImage.cpp

@@ -77 +77 @@
 }
 
+bool SVGImage::usesContainerSize() const
+{
+    SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();
+    if (!rootElement)
+        return false;
+
+    return rootElement->hasSetContainerSize();
+}
+
 IntSize SVGImage::size() const
 {

trunk/WebCore/svg/graphics/SVGImage.h

@@ -47 +47 @@
 
         virtual void setContainerSize(const IntSize&);
+        virtual bool usesContainerSize() const;
         virtual bool hasRelativeWidth() const;
         virtual bool hasRelativeHeight() const;