From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h') diff --git a/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h b/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h index c32e047..53da91f 100644 --- a/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h @@ -33,6 +33,9 @@ #if USE(WEBP) +// Forward declaration of libwebp's structure. Must be outside the WebCore scope. +typedef struct WebPIDecoder WebPIDecoder; + namespace WebCore { class WEBPImageDecoder : public ImageDecoder { @@ -46,6 +49,10 @@ public: private: // Returns false in case of decoding failure. bool decode(bool onlySize); + + WebPIDecoder* m_decoder; // This is only used when we want to decode() but not all data is available yet. + int m_lastVisibleRow; + Vector m_rgbOutput; }; } // namespace WebCore -- cgit v1.1