Changeset 191352 in webkit

Timestamp:

Oct 20, 2015, 1:38:03 PM (10 years ago)

Author:

Simon Fraser

Message:

Add basic TextStream output for Images
​https://bugs.webkit.org/show_bug.cgi?id=150350

Reviewed by Darin Adler.

Add a TextStream output operator for Image, and virtual dump() member functions
that the various image types override to dump their own data.

Add isFoo() functions for each image type (surprising that these didn't already
exist) so we can print the image type.

Make isAnimated() const, and isBitmapImage() private.

• platform/graphics/BitmapImage.cpp:

(WebCore::BitmapImage::dump):

• platform/graphics/BitmapImage.h:
• platform/graphics/CrossfadeGeneratedImage.cpp:

(WebCore::CrossfadeGeneratedImage::dump):

• platform/graphics/CrossfadeGeneratedImage.h:
• platform/graphics/GeneratedImage.cpp:
• platform/graphics/GeneratedImage.h:
• platform/graphics/GradientImage.cpp:

(WebCore::GradientImage::dump):

• platform/graphics/GradientImage.h:
• platform/graphics/Image.cpp:

(WebCore::Image::dump):
(WebCore::operator<<):

• platform/graphics/Image.h:

(WebCore::Image::isGeneratedImage):
(WebCore::Image::isCrossfadeGeneratedImage):
(WebCore::Image::isNamedImageGeneratedImage):
(WebCore::Image::isGradientImage):
(WebCore::Image::isSVGImage):
(WebCore::Image::isAnimated):

• platform/graphics/NamedImageGeneratedImage.cpp:

(WebCore::NamedImageGeneratedImage::dump):

• platform/graphics/NamedImageGeneratedImage.h:
• platform/graphics/cg/PDFDocumentImage.cpp:

(WebCore::PDFDocumentImage::dump):

• platform/graphics/cg/PDFDocumentImage.h:
• svg/graphics/SVGImage.cpp:

(WebCore::SVGImage::dump):

• svg/graphics/SVGImage.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/BitmapImage.cpp (modified) (2 diffs)
• platform/graphics/BitmapImage.h (modified) (4 diffs)
• platform/graphics/CrossfadeGeneratedImage.cpp (modified) (2 diffs)
• platform/graphics/CrossfadeGeneratedImage.h (modified) (1 diff)
• platform/graphics/GeneratedImage.cpp (modified) (1 diff)
• platform/graphics/GeneratedImage.h (modified) (1 diff)
• platform/graphics/GradientImage.cpp (modified) (2 diffs)
• platform/graphics/GradientImage.h (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (2 diffs)
• platform/graphics/Image.h (modified) (3 diffs)
• platform/graphics/NamedImageGeneratedImage.cpp (modified) (2 diffs)
• platform/graphics/NamedImageGeneratedImage.h (modified) (1 diff)
• platform/graphics/cg/PDFDocumentImage.cpp (modified) (2 diffs)
• platform/graphics/cg/PDFDocumentImage.h (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (2 diffs)
• svg/graphics/SVGImage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2015-10-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Add basic TextStream output for Images
+        https://bugs.webkit.org/show_bug.cgi?id=150350
+
+        Reviewed by Darin Adler.
+
+        Add a TextStream output operator for Image, and virtual dump() member functions
+        that the various image types override to dump their own data.
+        
+        Add isFoo() functions for each image type (surprising that these didn't already
+        exist) so we can print the image type.
+        
+        Make isAnimated() const, and isBitmapImage() private.
+
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::dump):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/CrossfadeGeneratedImage.cpp:
+        (WebCore::CrossfadeGeneratedImage::dump):
+        * platform/graphics/CrossfadeGeneratedImage.h:
+        * platform/graphics/GeneratedImage.cpp:
+        * platform/graphics/GeneratedImage.h:
+        * platform/graphics/GradientImage.cpp:
+        (WebCore::GradientImage::dump):
+        * platform/graphics/GradientImage.h:
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::dump):
+        (WebCore::operator<<):
+        * platform/graphics/Image.h:
+        (WebCore::Image::isGeneratedImage):
+        (WebCore::Image::isCrossfadeGeneratedImage):
+        (WebCore::Image::isNamedImageGeneratedImage):
+        (WebCore::Image::isGradientImage):
+        (WebCore::Image::isSVGImage):
+        (WebCore::Image::isAnimated):
+        * platform/graphics/NamedImageGeneratedImage.cpp:
+        (WebCore::NamedImageGeneratedImage::dump):
+        * platform/graphics/NamedImageGeneratedImage.h:
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::dump):
+        * platform/graphics/cg/PDFDocumentImage.h:
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::dump):
+        * svg/graphics/SVGImage.h:
+
 2015-10-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/BitmapImage.cpp ¶

@@ -34 +34 @@
 #include "IntRect.h"
 #include "MIMETypeRegistry.h"
+#include "TextStream.h"
 #include "Timer.h"
 #include <wtf/CurrentTime.h>
@@ -710 +711 @@
 }
 
-}
+void BitmapImage::dump(TextStream& ts) const
+{
+    Image::dump(ts);
+
+    ts.dumpProperty("type", m_source.filenameExtension());
+
+    if (isAnimated()) {
+        ts.dumpProperty("frame-count", m_frameCount);
+        ts.dumpProperty("repetitions", m_repetitionCount);
+        ts.dumpProperty("current-frame", m_currentFrame);
+    }
+    
+    if (allowSubsampling())
+        ts.dumpProperty("allow-subsampling", allowSubsampling());
+    if (m_isSolidColor)
+        ts.dumpProperty("solid-color", m_isSolidColor);
+    
+    if (m_imageOrientation != OriginTopLeft)
+        ts.dumpProperty("orientation", m_imageOrientation);
+}
+
+}

trunk/Source/WebCore/platform/graphics/BitmapImage.h ¶

@@ -122 +122 @@
     virtual ~BitmapImage();
     
-    virtual bool isBitmapImage() const override { return true; }
-
     virtual bool hasSingleSecurityOrigin() const override;
 
@@ -180 +178 @@
     virtual bool currentFrameKnownToBeOpaque() override;
 
-    virtual bool isAnimated() override { return m_frameCount > 1; }
+    virtual bool isAnimated() const override { return m_frameCount > 1; }
     
     bool canAnimate();
@@ -188 +186 @@
     
 private:
+    virtual bool isBitmapImage() const override { return true; }
+
     void updateSize(ImageOrientationDescription = ImageOrientationDescription()) const;
     void determineMinimumSubsamplingLevel() const;
@@ -292 +292 @@
     void startTimer(double delay);
 
+    virtual void dump(TextStream&) const override;
+
     ImageSource m_source;
     mutable IntSize m_size; // The size to use for the overall image (will just be the size of the first image).

trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.cpp ¶

@@ -30 +30 @@
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
+#include "TextStream.h"
 
 namespace WebCore {
@@ -110 +111 @@
 }
 
+void CrossfadeGeneratedImage::dump(TextStream& ts) const
+{
+    GeneratedImage::dump(ts);
+    ts.dumpProperty("from-image", m_fromImage.get());
+    ts.dumpProperty("to-image", m_toImage.get());
+    ts.dumpProperty("percentage", m_percentage);
 }
+
+}

trunk/Source/WebCore/platform/graphics/CrossfadeGeneratedImage.h ¶

@@ -56 +56 @@
 
 private:
+    virtual bool isCrossfadeGeneratedImage() const override { return true; }
+    virtual void dump(TextStream&) const override;
+    
     void drawCrossfade(GraphicsContext&);
 

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

@@ -34 +34 @@
 #include "FloatSize.h"
 
-
 namespace WebCore {
 

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

@@ -60 +60 @@
 
 private:
+    virtual bool isGeneratedImage() const override { return true; }
+
     FloatSize m_size;
 };

trunk/Source/WebCore/platform/graphics/GradientImage.cpp ¶

@@ -31 +31 @@
 #include "ImageBuffer.h"
 #include "Length.h"
+#include "TextStream.h"
 
 namespace WebCore {
@@ -95 +96 @@
 }
 
+void GradientImage::dump(TextStream& ts) const
+{
+    GeneratedImage::dump(ts);
+    // FIXME: dump the gradient.
 }
+
+}

trunk/Source/WebCore/platform/graphics/GradientImage.h ¶

@@ -54 +54 @@
 
 private:
+    virtual bool isGradientImage() const override { return true; }
+    virtual void dump(TextStream&) const override;
+    
     RefPtr<Gradient> m_gradient;
     std::unique_ptr<ImageBuffer> m_cachedImageBuffer;

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

@@ -35 +35 @@
 #include "MIMETypeRegistry.h"
 #include "SharedBuffer.h"
+#include "TextStream.h"
 #include <math.h>
 #include <wtf/MainThread.h>
@@ -271 +272 @@
 }
 
-}
+void Image::dump(TextStream& ts) const
+{
+    if (isAnimated())
+        ts.dumpProperty("animated", isAnimated());
+
+    if (isNull())
+        ts.dumpProperty("is-null-image", true);
+
+    ts.dumpProperty("size", size());
+}
+
+TextStream& operator<<(TextStream& ts, const Image& image)
+{
+    TextStream::GroupScope scope(ts);
+    
+    if (image.isBitmapImage())
+        ts << "bitmap image";
+    else if (image.isCrossfadeGeneratedImage())
+        ts << "crossfade image";
+    else if (image.isNamedImageGeneratedImage())
+        ts << "named image";
+    else if (image.isGradientImage())
+        ts << "gradient image";
+    else if (image.isSVGImage())
+        ts << "svg image";
+    else if (image.isPDFDocumentImage())
+        ts << "pdf image";
+
+    image.dump(ts);
+    return ts;
+}
+
+}

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

@@ -81 +81 @@
     WEBCORE_EXPORT static bool supportsType(const String&);
 
+    virtual bool isBitmapImage() const { return false; }
+    virtual bool isGeneratedImage() const { return false; }
+    virtual bool isCrossfadeGeneratedImage() const { return false; }
+    virtual bool isNamedImageGeneratedImage() const { return false; }
+    virtual bool isGradientImage() const { return false; }
     virtual bool isSVGImage() const { return false; }
-    virtual bool isBitmapImage() const { return false; }
     virtual bool isPDFDocumentImage() const { return false; }
+
     virtual bool currentFrameKnownToBeOpaque() = 0;
-
-    virtual bool isAnimated() { return false; }
+    virtual bool isAnimated() const { return false; }
 
     // Derived classes should override this if they can assure that 
@@ -178 +182 @@
 #endif
 
+    virtual void dump(TextStream&) const;
+
 protected:
     Image(ImageObserver* = nullptr);
@@ -201 +207 @@
 };
 
+TextStream& operator<<(TextStream&, const Image&);
+
 } // namespace WebCore
 

trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.cpp ¶

@@ -30 +30 @@
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
+#include "TextStream.h"
 #include "Theme.h"
 
@@ -86 +87 @@
 }
 
+void NamedImageGeneratedImage::dump(TextStream& ts) const
+{
+    GeneratedImage::dump(ts);
+    ts.dumpProperty("name", m_name);
 }
+
+}

trunk/Source/WebCore/platform/graphics/NamedImageGeneratedImage.h ¶

@@ -48 +48 @@
 
 private:
+    virtual bool isNamedImageGeneratedImage() const override { return true; }
+    virtual void dump(TextStream&) const override;
+
     String m_name;
 };

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

@@ -41 +41 @@
 #include "Length.h"
 #include "SharedBuffer.h"
+#include "TextStream.h"
 #include <CoreGraphics/CGContext.h>
 #include <CoreGraphics/CGPDFDocument.h>
@@ -265 +266 @@
 #endif // !USE(PDFKIT_FOR_PDFDOCUMENTIMAGE)
 
+void PDFDocumentImage::dump(TextStream& ts) const
+{
+    Image::dump(ts);
+    ts.dumpProperty("page-count", pageCount());
+    ts.dumpProperty("crop-box", m_cropBox);
+    if (m_rotationDegrees)
+        ts.dumpProperty("rotation", m_rotationDegrees);
+}
+
 }
 

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

@@ -75 +75 @@
     virtual bool currentFrameKnownToBeOpaque() override { return false; }
 
+    virtual void dump(TextStream&) const override;
+
     void createPDFDocument();
     void computeBoundsForCurrentPage();

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

@@ -46 +46 @@
 #include "SVGSVGElement.h"
 #include "Settings.h"
+#include "TextStream.h"
 
 namespace WebCore {
@@ -401 +402 @@
 }
 
-}
+void SVGImage::dump(TextStream& ts) const
+{
+    Image::dump(ts);
+    ts.dumpProperty("url", m_url.string());
+}
+
+
+}

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

@@ -91 +91 @@
     virtual bool currentFrameKnownToBeOpaque() override { return false; }
 
+    virtual void dump(TextStream&) const override;
+
     SVGImage(ImageObserver&, const URL&);
     virtual void draw(GraphicsContext&, const FloatRect& fromRect, const FloatRect& toRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) override;