--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h Tue Apr 27 17:46:17 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h Tue May 11 17:13:44 2010 +0300
@@ -48,8 +48,11 @@
// INCLUDES
+#include <../bidi.h>
+#include "config.h"
#include <e32base.h>
#include <imageconversion.h> // TFrameInfo
+#include <RefPtr.h>
// FORWARD DECLARATIONS
class CMaskedBitmap;
@@ -57,8 +60,8 @@
class CSynDecodeThread;
namespace WebCore {
class ImageObserver;
-}
-// CONSTANTS
+ class SharedBuffer;
+};
_LIT(KMimeJPEG, "image/jpeg");
_LIT(KMimeJPG, "image/jpg");
@@ -106,24 +109,19 @@
/*
* From MIHLFileImage, see base class header.
*/
- void OpenL( const TDesC8& aData, TDesC* aMIMEType, TBool aIsComplete );
+ void OpenL( WebCore::SharedBuffer* aData, TDesC* aMIMEType, TBool aIsComplete );
void OpenAndDecodeSyncL( const TDesC8& aData );
/*
* From MIHLFileImage, see base class header.
*/
- void AddDataL( const TDesC8& aData, TBool aIsComplete );
-
- /*
- * From MIHLFileImage, see base class header.
- */
TSize Size() const { return iFrameInfo.iOverallSizeInPixels; }
/*
* From MIHLFileImage, see base class header.
*/
- TDisplayMode DisplayMode() const { return KMaxDepth; }
-
+ TDisplayMode DisplayMode() const { return KMaxDepth;}
+
/*
* From MIHLFileImage, see base class header.
*/
@@ -225,13 +223,14 @@
};
private: // Data
-
+ RefPtr<WebCore::SharedBuffer> m_data;
+ TPtrC8 m_dataptr;
// Image status & state
TRequestStatus* iImageStatus;
TImageState iImageState;
// Own: Image decoder
- CBufferedImageDecoder* iDecoder; // owned
+ CImageDecoder* iDecoder; // owned
TFrameInfo iFrameInfo;
TBool iAnimation;