Changeset 97727 in webkit

Timestamp:

Oct 18, 2011 1:39:18 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

2011-10-18 Nikolas Zimmermann <​nzimmermann@rim.com>

Prepare SVGImage intrinsic size negotiation: Add intrinsic size & ratio calculation functionality to Image
​https://bugs.webkit.org/show_bug.cgi?id=70314

Reviewed by Antti Koivisto.

Add a "void computeIntrinsicDimension(Length& intrinsicWidth, Lengt& intrinsicHeight, FloatSize& intrinsicRatio)" helper method
to Image/GeneratedImage/SVGImage and make it accessible through StyleImage.

For a regular Image the intrinsicWidth/Height contains just a Length(size().width(), Fixed). In contrary SVGImages pass on the
style()->width()/height() values from the render style of the RenderSVGRoot renderer. These information are needed to implement
the size negotiation between embedded SVG images and the embedder.

No new tests, as this new functionality is not yet used.

• loader/cache/CachedImage.cpp: (WebCore::CachedImage::computeIntrinsicDimensions):
• loader/cache/CachedImage.h:
• platform/graphics/GeneratedImage.cpp: (WebCore::GeneratedImage::computeIntrinsicDimensions):
• platform/graphics/GeneratedImage.h:
• platform/graphics/Image.cpp: (WebCore::Image::computeIntrinsicDimensions):
• platform/graphics/Image.h:
• platform/graphics/cg/PDFDocumentImage.cpp: (WebCore::PDFDocumentImage::computeIntrinsicDimensions):
• platform/graphics/cg/PDFDocumentImage.h:
• rendering/style/StyleCachedImage.cpp: (WebCore::StyleCachedImage::computeIntrinsicDimensions):
• rendering/style/StyleCachedImage.h:
• rendering/style/StyleGeneratedImage.cpp: (WebCore::StyleGeneratedImage::computeIntrinsicDimensions):
• rendering/style/StyleGeneratedImage.h:
• rendering/style/StyleImage.h:
• rendering/style/StylePendingImage.h: (WebCore::StylePendingImage::computeIntrinsicDimensions):
• svg/graphics/SVGImage.cpp: (WebCore::SVGImage::computeIntrinsicDimensions):
• svg/graphics/SVGImage.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (1 diff)
• loader/cache/CachedImage.h (modified) (2 diffs)
• platform/graphics/GeneratedImage.cpp (modified) (2 diffs)
• platform/graphics/GeneratedImage.h (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (2 diffs)
• platform/graphics/Image.h (modified) (2 diffs)
• platform/graphics/cg/PDFDocumentImage.cpp (modified) (2 diffs)
• platform/graphics/cg/PDFDocumentImage.h (modified) (1 diff)
• rendering/style/StyleCachedImage.cpp (modified) (1 diff)
• rendering/style/StyleCachedImage.h (modified) (1 diff)
• rendering/style/StyleGeneratedImage.cpp (modified) (1 diff)
• rendering/style/StyleGeneratedImage.h (modified) (1 diff)
• rendering/style/StyleImage.h (modified) (1 diff)
• rendering/style/StylePendingImage.h (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (1 diff)
• svg/graphics/SVGImage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-18  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Prepare SVGImage intrinsic size negotiation: Add intrinsic size & ratio calculation functionality to Image
+        https://bugs.webkit.org/show_bug.cgi?id=70314
+
+        Reviewed by Antti Koivisto.
+
+        Add a "void computeIntrinsicDimension(Length& intrinsicWidth, Lengt& intrinsicHeight, FloatSize& intrinsicRatio)" helper method
+        to Image/GeneratedImage/SVGImage and make it accessible through StyleImage.
+
+        For a regular Image the intrinsicWidth/Height contains just a Length(size().width(), Fixed). In contrary SVGImages pass on the
+        style()->width()/height() values from the render style of the RenderSVGRoot renderer. These information are needed to implement
+        the size negotiation between embedded SVG images and the embedder.
+
+        No new tests, as this new functionality is not yet used.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::computeIntrinsicDimensions):
+        * loader/cache/CachedImage.h:
+        * platform/graphics/GeneratedImage.cpp:
+        (WebCore::GeneratedImage::computeIntrinsicDimensions):
+        * platform/graphics/GeneratedImage.h:
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::computeIntrinsicDimensions):
+        * platform/graphics/Image.h:
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::computeIntrinsicDimensions):
+        * platform/graphics/cg/PDFDocumentImage.h:
+        * rendering/style/StyleCachedImage.cpp:
+        (WebCore::StyleCachedImage::computeIntrinsicDimensions):
+        * rendering/style/StyleCachedImage.h:
+        * rendering/style/StyleGeneratedImage.cpp:
+        (WebCore::StyleGeneratedImage::computeIntrinsicDimensions):
+        * rendering/style/StyleGeneratedImage.h:
+        * rendering/style/StyleImage.h:
+        * rendering/style/StylePendingImage.h:
+        (WebCore::StylePendingImage::computeIntrinsicDimensions):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::computeIntrinsicDimensions):
+        * svg/graphics/SVGImage.h:
+
 2011-10-17  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -240 +240 @@
         height = max(1, height);
     return IntSize(width, height);
+}
+
+void CachedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    if (Image* image = lookupImageForRenderer(renderer))
+        image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 

trunk/Source/WebCore/loader/cache/CachedImage.h

@@ -35 +35 @@
 
 class CachedResourceLoader;
+class Length;
+class FloatSize;
 class MemoryCache;
 class RenderObject;
@@ -65 +67 @@
     // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
     IntSize imageSizeForRenderer(const RenderObject*, float multiplier); // returns the size of the complete image.
+    void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual void didAddClient(CachedResourceClient*);

trunk/Source/WebCore/platform/graphics/GeneratedImage.cpp

@@ -30 +30 @@
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
-
-using namespace std;
+#include "Length.h"
 
 namespace WebCore {
@@ -68 +67 @@
 }
 
+void GeneratedImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    Image::computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
+    intrinsicRatio = FloatSize();
 }
+
+}

trunk/Source/WebCore/platform/graphics/GeneratedImage.h

@@ -45 +45 @@
     virtual bool hasSingleSecurityOrigin() const { return true; }
 
-    // These are only used for SVGGeneratedImage right now
     virtual void setContainerSize(const IntSize& size) { m_size = size; }
     virtual bool usesContainerSize() const { return true; }
     virtual bool hasRelativeWidth() const { return true; }
     virtual bool hasRelativeHeight() const { return true; }
+    virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual IntSize size() const { return m_size; }

trunk/Source/WebCore/platform/graphics/Image.cpp

@@ -32 +32 @@
 #include "GraphicsContext.h"
 #include "IntRect.h"
+#include "Length.h"
 #include "MIMETypeRegistry.h"
 #include "SharedBuffer.h"
@@ -167 +168 @@
 }
 
+void Image::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    intrinsicRatio = size();
+    intrinsicWidth = Length(intrinsicRatio.width(), Fixed);
+    intrinsicHeight = Length(intrinsicRatio.height(), Fixed);
+}
 
 }

trunk/Source/WebCore/platform/graphics/Image.h

@@ -72 +72 @@
 class FloatSize;
 class GraphicsContext;
+class Length;
 class SharedBuffer;
 
@@ -99 +100 @@
     bool isNull() const { return size().isEmpty(); }
 
-    // These are only 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; }
+    virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual IntSize size() const = 0;

trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

@@ -32 +32 @@
 #include "GraphicsContext.h"
 #include "ImageObserver.h"
+#include "Length.h"
 #include "SharedBuffer.h"
 #include <CoreGraphics/CGContext.h>
@@ -74 +75 @@
     
     return IntSize((int)(fabsf(rotWidth) + 0.5f), (int)(fabsf(rotHeight) + 0.5f));
+}
+
+void PDFDocumentImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    // FIXME: If we want size negotiation with PDF documents as-image, this is the place to implement it (https://bugs.webkit.org/show_bug.cgi?id=12095).
+    Image::computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
+    intrinsicRatio = FloatSize();
 }
 

trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h

@@ -60 +60 @@
         virtual unsigned decodedSize() const { return 0; }
 
+        virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
         virtual IntSize size() const;
 

trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp

@@ -65 +65 @@
 }
 
+void StyleCachedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    m_image->computeIntrinsicDimensions(renderer, intrinsicWidth, intrinsicHeight, intrinsicRatio);
+}
+
 bool StyleCachedImage::usesImageContainerSize() const
 {

trunk/Source/WebCore/rendering/style/StyleCachedImage.h

@@ -47 +47 @@
     virtual bool imageHasRelativeWidth() const;
     virtual bool imageHasRelativeHeight() const;
+    virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
     virtual bool usesImageContainerSize() const;
     virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&);

trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp

@@ -59 +59 @@
 }
 
+void StyleGeneratedImage::computeIntrinsicDimensions(const RenderObject* renderer, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    IntSize size = imageSize(renderer, 1);
+    intrinsicWidth = Length(size.width(), Fixed);
+    intrinsicHeight = Length(size.height(), Fixed);
+    intrinsicRatio = size;
+}
+
 void StyleGeneratedImage::addClient(RenderObject* renderer)
 {

trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h

@@ -46 +46 @@
     virtual bool imageHasRelativeWidth() const { return !m_fixedSize; }
     virtual bool imageHasRelativeHeight() const { return !m_fixedSize; }
+    virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
     virtual bool usesImageContainerSize() const { return !m_fixedSize; }
     virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize& containerSize) { m_containerSize = containerSize; }

trunk/Source/WebCore/rendering/style/StyleImage.h

@@ -54 +54 @@
     virtual bool errorOccurred() const { return false; }
     virtual IntSize imageSize(const RenderObject*, float multiplier) const = 0;
+    virtual void computeIntrinsicDimensions(const RenderObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) = 0;
     virtual bool imageHasRelativeWidth() const = 0;
     virtual bool imageHasRelativeHeight() const = 0;

trunk/Source/WebCore/rendering/style/StylePendingImage.h

@@ -48 +48 @@
     virtual bool imageHasRelativeWidth() const { return false; }
     virtual bool imageHasRelativeHeight() const { return false; }
+    virtual void computeIntrinsicDimensions(const RenderObject*, Length& /* intrinsicWidth */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) { }
     virtual bool usesImageContainerSize() const { return false; }
     virtual void setContainerSizeForRenderer(const RenderObject*, const IntSize&) { }

trunk/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -214 +214 @@
 }
 
+void SVGImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
+{
+    if (!m_page)
+        return;
+    Frame* frame = m_page->mainFrame();
+    SVGSVGElement* rootElement = static_cast<SVGDocument*>(frame->document())->rootElement();
+    if (!rootElement)
+        return;
+    RenderBox* renderer = toRenderBox(rootElement->renderer());
+    if (!renderer)
+        return;
+
+    intrinsicWidth = renderer->style()->width();
+    intrinsicHeight = renderer->style()->height();
+    // FIXME: Add intrinsicRatio calculation from webkit.org/b/47156.
+    intrinsicRatio = FloatSize();
+}
+
 NativeImagePtr SVGImage::nativeImageForCurrentFrame()
 {

trunk/Source/WebCore/svg/graphics/SVGImage.h

@@ -56 +56 @@
     virtual bool hasRelativeWidth() const;
     virtual bool hasRelativeHeight() const;
+    virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual IntSize size() const;