FCL/sf/mw/uiresources: comparison uigraphics/NVGRenderStage/src/nvgrenderstage.cpp

equal deleted inserted replaced

-:57ed406024d5
+:f6fd4830a02c
 #include <graphics/wsrenderstage.h>
 #include <s32mem.h>
 #include <AknIconHeader.h>
 #include <AknIconUtils.h>
+TCachedConversion::TCachedConversion() :
+iLink(), iCachedResult(NULL)
+{}
+TCachedConversion::~TCachedConversion()
+{
+delete iCachedResult;
+}
 const TUid KUidNvgExtendedBitmap = {0x39b9273e};
 CNvgRenderStage::CNvgRenderStage() :
-	iExtendedBitmapError(KErrNone)
+	iExtendedBitmapError(KErrNone),
+	iCache(_FOFF(TCachedConversion,iLink)),
+	iCacheIterator(iCache),
+	iCacheFree(MAX_NVG_CACHE_SIZE)
 	{
 	}
 /** Called by CNvgRenderStageFactory::CreateRenderStageL() and
 CNvgRenderStageFactory::CreateFinalRenderStageL() when a new render stage
 	return stage;
 	}
 void CNvgRenderStage::ConstructL(CWsRenderStage* aNextStage)
 	{
-	iBmp = new(ELeave) CFbsBitmap;
-	iMaskBmp = new(ELeave) CFbsBitmap;
 	iBrushPattern = new(ELeave) CFbsBitmap;
 	iInternalBrushPattern = new(ELeave) CFbsBitmap;
 	iGraphicsInterface = new(ELeave) CVGIGraphicsInterface;
 iNvgEngine = CNvgEngine::NewL();
 iNvgEngine->SetVGImageBinder(iGraphicsInterface);
 	}
 CNvgRenderStage::~CNvgRenderStage()
 	{
 	iEmptyRegion.Close();
-	delete iBmp;
-	delete iMaskBmp;
 	delete iBrushPattern;
 	delete iInternalBrushPattern;
 	delete iNvgEngine;
 	delete iGraphicsInterface;
+	iCacheIterator.SetToFirst();
+TCachedConversion* cached = iCacheIterator++;
+	while (cached != NULL)
+	 {
+delete cached;
+cached = iCacheIterator++;
+}
 	}
 /** The only interface returned by this render stage is MWsGraphicsContext.
 All other interface requests are passed to the base render stage class for resolving.
 */
 void CNvgRenderStage::BitBlt(const TPoint& aDestPos, const CFbsBitmap& aSourceBitmap)
 	{
 	if (iGc)
 		{
+		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			TRect destRect(TPoint(aDestPos.iX,aDestPos.iY), aSourceBitmap.SizeInPixels());
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			DrawExtendedBitmap(*iGc, destRect, aSourceBitmap);
 			}
-		else
-			{
+		iGc->BitBlt(aDestPos, *sourceBitmap);
-			iGc->BitBlt(aDestPos, aSourceBitmap);
-			}
 		}
 	}
 /** If the passed bitmap is an extended bitmap of type 0x39b9273e, draw it to the
 stored graphics context of the next render stage using  DrawExtendedBitmap(), if the
 */
 void CNvgRenderStage::BitBlt(const TPoint& aDestPos, const CFbsBitmap& aSourceBitmap, const TRect& aSourceRect)
 	{
 	if (iGc)
 		{
+		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			TRect destRect(TPoint(aDestPos.iX,aDestPos.iY), aSourceRect.Size());
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			DrawExtendedBitmap(*iGc, destRect, aSourceBitmap);
 			}
-		else
-			{
+		iGc->BitBlt(aDestPos, *sourceBitmap, aSourceRect);
-			iGc->BitBlt(aDestPos, aSourceBitmap, aSourceRect);
-			}
 		}
 	}
 /** If either of the passed bitmaps is an extended bitmap of type 0x39b9273e convert
 to a normal bitmap before passing to the next render stage, otherwise
 		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		CFbsBitmap* maskBitmap = const_cast<CFbsBitmap*>(&aMaskBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			sourceBitmap = iBmp;
 			}
 		if (aMaskBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aMaskBitmap, *iMaskBmp);
+			maskBitmap = GetConvertedBitmap(aMaskBitmap);
-			maskBitmap = iMaskBmp;
 			}
 		iGc->BitBltMasked(aDestPos, *sourceBitmap, aSourceRect, *maskBitmap, aInvertMask);
 		}
 	}
 		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		CFbsBitmap* maskBitmap = const_cast<CFbsBitmap*>(&aMaskBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			sourceBitmap = iBmp;
 			}
 		if (aMaskBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aMaskBitmap, *iMaskBmp);
+			maskBitmap = GetConvertedBitmap(aMaskBitmap);
-			maskBitmap = iMaskBmp;
 			}
 		iGc->BitBltMasked(aDestPos, *sourceBitmap, aSourceRect, *maskBitmap, aMaskPos);
 		}
 	}
 		{
 		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			sourceBitmap = iBmp;
 			}
 		iGc->DrawBitmap(aDestRect, *sourceBitmap);
 		}
 	}
 		{
 		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			sourceBitmap = iBmp;
 			}
 		iGc->DrawBitmap(aDestRect, *sourceBitmap, aSourceRect);
 		}
 	}
 		CFbsBitmap* sourceBitmap = const_cast<CFbsBitmap*>(&aSourceBitmap);
 		CFbsBitmap* maskBitmap = const_cast<CFbsBitmap*>(&aMaskBitmap);
 		if (aSourceBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+			sourceBitmap = GetConvertedBitmap(aSourceBitmap);
-			sourceBitmap = iBmp;
 			}
 		if (aMaskBitmap.ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(aMaskBitmap, *iMaskBmp);
+			maskBitmap = GetConvertedBitmap(aMaskBitmap);
-			maskBitmap = iMaskBmp;
 			}
 		iGc->DrawBitmapMasked(aDestRect, *sourceBitmap, aSourceRect, *maskBitmap, aInvertMask);
 		}
 	}
 	if (iGc)
 		{
 		iBrushPattern->Duplicate(aFbsBitmapHandle);
 		if (iBrushPattern->ExtendedBitmapType() == KUidNvgExtendedBitmap)
 			{
-			CopyExtendedBitmapToNormalBitmap(*iBrushPattern, *iInternalBrushPattern);
+			iInternalBrushPattern = GetConvertedBitmap(*iBrushPattern);
 			iGc->SetBrushPattern(*iInternalBrushPattern);
 			}
 		else
 			{
 			iGc->SetBrushPattern(aFbsBitmapHandle);
 		{
 		iGc->Pop();
 		}
 	}
-/** Helper method used by BitBlt() and DrawBitmap()
+/** Helper method that draws an NVG extended bitmap into a normal bitmap.
-@param aGc The graphics context to draw the extended bitmap to.
-@param aDestRect The rectangle that the source bitmap will be drawn to.
+@param aExtendedBitmapSrc The extended bitmap to draw
-@param aSourceBitmap The extended bitmap of type 0x39b9273e to be drawn.
+@pre aExtendedBitmapSrc must be an extended bitmap of extended bitmap type 0x39b9273e
-@pre aSourceBitmap must be an extended bitmap of type 0x39b9273e.
+*/
-@post Sets an error that can be retrieved using GetError() is an error occurs.
-*/
+CFbsBitmap* CNvgRenderStage::GetConvertedBitmap(const CFbsBitmap& aExtendedBitmapSrc)
-void CNvgRenderStage::DrawExtendedBitmap(MWsGraphicsContext& aGc, const TRect& aDestRect, const CFbsBitmap& aSourceBitmap)
+{
-	{
+aExtendedBitmapSrc.BeginDataAccess();
-CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+const TUint8* bmpData = (const TUint8*)aExtendedBitmapSrc.DataAddress();
-aGc.BitBlt(aDestRect.iTl, *iBmp);
-	}
+TPtr8 IconHeaderPtr((TUint8*)bmpData, KIconHeaderLength, KIconHeaderLength);
+TAknIconHeader iconheader(IconHeaderPtr);
-/** Helper method used by BitBlt() and DrawBitmap()
+TUint32 bitmapid = iconheader.GetBitmapId();
-@param aGc The graphics context to draw the extended bitmap to.
+TUint32 handle = aExtendedBitmapSrc.Handle();
-@param aDestRect The rectangle that the source bitmap will be drawn to.
+aExtendedBitmapSrc.EndDataAccess();
-@param aSourceBitmap The extended bitmap of type 0x39b9273e to be drawn.
+CFbsBitmap* error = const_cast<CFbsBitmap*>(&aExtendedBitmapSrc);  // not renderable, but better than panic!
-@pre aSourceBitmap must be an extended bitmap of type 0x39b9273e.
+// look to see if we have this in the cache
-@post Sets an error that can be retrieved using GetError() is an error occurs.
+iCacheIterator.SetToFirst();
-*/
+TCachedConversion* cached = iCacheIterator++;
-void CNvgRenderStage::DrawExtendedBitmap(CFbsBitGc& aGc, const TRect& aDestRect, const CFbsBitmap& aSourceBitmap)
+while (cached != NULL)
-	{
+{
-CopyExtendedBitmapToNormalBitmap(aSourceBitmap, *iBmp);
+if (cached->iBitmapID == bitmapid && cached->iDiscriminator == handle)
-aGc.BitBlt(aDestRect.iTl, iBmp);
+{
-	}
+// Cache hit
+#ifdef DEBUG_NVG_RENDERSTAGE
+RDebug::Printf("NVG Render cache hit for id %08x, handle %d\n", bitmapid, handle);
+#endif
+cached->Deque();
+iCache.AddFirst(*cached);  // move to front of the list, to record use
+return cached->iCachedResult;
+}
+cached = iCacheIterator++;
+}
+// missed in the cache, need to perform the conversion
+TInt err = KErrNone;
+if (iCacheFree > 0)
+{
+// just allocate a new entry, which will be added to the end
+TRAP(err, cached = new(ELeave) TCachedConversion);
+if (err != KErrNone)
+{
+return error;
+}
+TRAP(err, cached->iCachedResult = new(ELeave) CFbsBitmap);
+if (err != KErrNone)
+{
+delete cached;
+return error;
+}
+}
+else
+{
+// Remove the least recently used item
+cached = iCache.Last();
+cached->Deque();  // remove from the cache
+iCacheFree++;
+#ifdef DEBUG_NVG_RENDERSTAGE
+RDebug::Printf("NVG Render cache removing id %08x, handle %d\n", cached->iBitmapID, cached->iDiscriminator);
+#endif
+}
+// cached is now available to hold the new result
+cached->iBitmapID = bitmapid;
+cached->iDiscriminator = handle;
+CopyExtendedBitmapToNormalBitmap(aExtendedBitmapSrc, *cached->iCachedResult);
+if (iExtendedBitmapError != KErrNone)
+{
+delete cached;
+return error;
+}
+// Newly cached bitmap is valid
+iCache.AddFirst(*cached);
+iCacheFree--;
+#ifdef DEBUG_NVG_RENDERSTAGE
+RDebug::Printf("NVG Render cache added id %08x, handle %d (%d free)\n", bitmapid, handle, iCacheFree);
+#endif
+return cached->iCachedResult;
+}
 /** Helper method that draws an NVG extended bitmap into a normal bitmap. The normal
 bitmap passed is resized before the extended bitmap is drawn into it.
 @param aExtendedBitmapSrc The extended bitmap to draw in to the normal bitmap aBitmapDest
 @param aBitmapDest The normal bitmap that the extended bitmap is to be drawn into
 @pre aExtendedBitmapSrc must be an extended bitmap of extended bitmap type 0x39b9273e
 @post aBitmapDest has been reset and resized and now contains a representation of the aExtendedBitmapSrc
 */
 void CNvgRenderStage::CopyExtendedBitmapToNormalBitmap(const CFbsBitmap& aExtendedBitmapSrc, CFbsBitmap& aBitmapDst)
 	{
 	TSize size = aExtendedBitmapSrc.SizeInPixels();
 	TInt err = aBitmapDst.Create(size, aExtendedBitmapSrc.DisplayMode());
 	if (err != KErrNone)
 aExtendedBitmapSrc.BeginDataAccess();
 const TUint8* bmpData = (const TUint8*)aExtendedBitmapSrc.DataAddress();
 TPtr8 IconHeaderPtr((TUint8*)bmpData, KIconHeaderLength, KIconHeaderLength);
 TAknIconHeader iconheader(IconHeaderPtr);
+#ifdef DEBUG_NVG_RENDERSTAGE
+RDebug::Printf("ConvertExtendedBitmap: id=%08x size (%d x %d)\n", iconheader.GetBitmapId(), size.iWidth, size.iHeight);
+#endif
 TInt dataSize = aExtendedBitmapSrc.DataSize();
 // skip TNVGIconHeader structure - we only know about version 0
 if (bmpData[2] == 0)
 {

changeset 20	f6fd4830a02c
parent 15	1bd1043e4812