diff -r a359256acfc6 -r c8a366e56285 webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h --- a/webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h Thu Aug 27 07:44:59 2009 +0300 +++ b/webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h Thu Sep 24 12:53:48 2009 +0300 @@ -22,6 +22,7 @@ #include #include #include "HttpCacheHandler.h" +#include "HttpCacheEntry.h" #include "MemoryManager.h" // CONSTANTS @@ -43,7 +44,7 @@ * @lib * @since 5.0 */ -NONSHARABLE_CLASS(CHttpCacheFileWriteHandler) : public CActive, public MMemoryCollector +NONSHARABLE_CLASS(CHttpCacheFileWriteHandler) : public CActive, public MMemoryCollector, public MHttpCacheEntryDeleteObserver { public: // Constructors and destructor @@ -54,7 +55,7 @@ * @param * @return CacheFileWriteHandler object. */ - static CHttpCacheFileWriteHandler* NewL(CHttpCacheHandler* aManager, CHttpCacheStreamHandler* aStreamHandler, RFs& aRfs, const TInt aWriteTimeout); + static CHttpCacheFileWriteHandler* NewL(CHttpCacheHandler* aManager, CHttpCacheStreamHandler* aStreamHandler, RFs& aRfs, const THttpCachePostponeParameters& aParams); /** * Destructor. @@ -97,6 +98,10 @@ */ TBool IsCacheEntryPostponed(const CHttpCacheEntry* aEntry); + public: // from MHttpCacheEntryDeleteObserver + virtual void EntryDeleted(CHttpCacheEntry *aEntry); + + public: // new functions enum TAddStatus { EAddedOk, @@ -148,7 +153,7 @@ /** * By default Symbian 2nd phase constructor is private. */ - void ConstructL(const TInt aWriteTimeout); + void ConstructL(const THttpCachePostponeParameters& aParams); /** * from CActive @@ -166,6 +171,7 @@ // sort by size function for arrays of CHttpCacheEntry objects. static TInt CompareHttpCacheEntrySize( const CHttpCacheEntry& aFirst, const CHttpCacheEntry& aSecond ); + void CollectMemory( TUint aRequired ); /**