Diff
Modified: trunk/Source/WebCore/ChangeLog (160206 => 160207)
--- trunk/Source/WebCore/ChangeLog 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 02:52:12 UTC (rev 160207)
@@ -1,3 +1,22 @@
+2013-12-05 Tim Horton <[email protected]>
+
+ Remove Image::decodedSize()
+ https://bugs.webkit.org/show_bug.cgi?id=125327
+
+ Reviewed by Sam Weinig.
+
+ No new tests, just removing dead code.
+
+ * platform/graphics/BitmapImage.cpp:
+ (WebCore::BitmapImage::resetAnimation):
+ * platform/graphics/BitmapImage.h:
+ * platform/graphics/GeneratedImage.h:
+ * platform/graphics/Image.h:
+ * platform/graphics/cg/PDFDocumentImage.cpp:
+ * platform/graphics/cg/PDFDocumentImage.h:
+ * svg/graphics/SVGImage.h:
+ * svg/graphics/SVGImageForContainer.h:
+
2013-12-05 Commit Queue <[email protected]>
Unreviewed, rolling out r160133.
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp 2013-12-06 02:52:12 UTC (rev 160207)
@@ -499,11 +499,6 @@
destroyDecodedDataIfNecessary(true);
}
-unsigned BitmapImage::decodedSize() const
-{
- return m_decodedSize;
-}
-
void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const AffineTransform& transform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator op, const FloatRect& destRect, BlendMode blendMode)
{
Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -134,8 +134,6 @@
virtual void stopAnimation() OVERRIDE;
virtual void resetAnimation() OVERRIDE;
- virtual unsigned decodedSize() const OVERRIDE;
-
virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal) OVERRIDE;
Modified: trunk/Source/WebCore/platform/graphics/GeneratedImage.h (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/GeneratedImage.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/GeneratedImage.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -47,7 +47,6 @@
// Assume that generated content has no decoded data we need to worry about
virtual void destroyDecodedData(bool /*destroyAll*/ = true) OVERRIDE { }
- virtual unsigned decodedSize() const OVERRIDE { return 0; }
protected:
virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, ImageOrientationDescription) OVERRIDE = 0;
Modified: trunk/Source/WebCore/platform/graphics/Image.h (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/Image.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/Image.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -124,7 +124,6 @@
virtual String filenameExtension() const { return String(); } // null string if unknown
virtual void destroyDecodedData(bool destroyAll = true) = 0;
- virtual unsigned decodedSize() const = 0;
SharedBuffer* data() { return m_encodedImageData.get(); }
Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2013-12-06 02:52:12 UTC (rev 160207)
@@ -209,14 +209,6 @@
m_cachedBytes = 0;
}
-unsigned PDFDocumentImage::decodedSize() const
-{
- // FIXME: PDFDocumentImage is underreporting decoded sizes because this
- // only includes the cached image and nothing else.
-
- return m_cachedBytes;
-}
-
#if !USE(PDFKIT_FOR_PDFDOCUMENTIMAGE)
void PDFDocumentImage::createPDFDocument()
{
Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (160206 => 160207)
--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -65,7 +65,6 @@
virtual bool dataChanged(bool allDataReceived) OVERRIDE;
virtual void destroyDecodedData(bool /*destroyAll*/ = true) OVERRIDE;
- virtual unsigned decodedSize() const OVERRIDE;
virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) OVERRIDE;
virtual IntSize size() const OVERRIDE;
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.h (160206 => 160207)
--- trunk/Source/WebCore/svg/graphics/SVGImage.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -85,7 +85,6 @@
// FIXME: SVGImages are underreporting decoded sizes and will be unable
// to prune because these functions are not implemented yet.
virtual void destroyDecodedData(bool) OVERRIDE { }
- virtual unsigned decodedSize() const OVERRIDE { return 0; }
// FIXME: Implement this to be less conservative.
virtual bool currentFrameKnownToBeOpaque() OVERRIDE { return false; }
Modified: trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h (160206 => 160207)
--- trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2013-12-06 01:50:15 UTC (rev 160206)
+++ trunk/Source/WebCore/svg/graphics/SVGImageForContainer.h 2013-12-06 02:52:12 UTC (rev 160207)
@@ -73,7 +73,6 @@
}
virtual void destroyDecodedData(bool /*destroyAll*/ = true) OVERRIDE { }
- virtual unsigned decodedSize() const OVERRIDE { return 0; }
SVGImage* m_image;
const FloatSize m_containerSize;
