diff -r 7516d6d86cf5 -r ed14f46c0e55 src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.h --- a/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.h Mon Oct 04 17:49:30 2010 +0300 +++ b/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.h Mon Oct 18 18:23:13 2010 +0300 @@ -33,22 +33,34 @@ struct HbIconCacheItem { - HbIconCacheItem() - { - rasterIconData.type = INVALID_FORMAT; - vectorIconData.type = INVALID_FORMAT; - blobIconData.type = INVALID_FORMAT; - refCount = 0; - rasterIconDataCost = 0; - vectorIconDataCost = 0; - iconOptions = (HbIconLoader::ReturnUnknownIcon | HbIconLoader::BitmapIcons | - HbIconLoader::VectorIcons); + HbIconCacheItem() + : refCount(0), + rasterIconDataCost(0), + vectorIconDataCost(0), + iconOptions(HbIconLoader::ReturnUnknownIcon | HbIconLoader::BitmapIcons | + HbIconLoader::VectorIcons) + { } ~HbIconCacheItem() { } + HbRenderingMode renderingMode() + { + HbRenderingMode rm = EHWRendering; + + if (rasterIconData.type != INVALID_FORMAT) { + rm = rasterIconData.renderingMode; + } else if (vectorIconData.type != INVALID_FORMAT) { + rm = vectorIconData.renderingMode; + } else if (blobIconData.type != INVALID_FORMAT) { + rm = blobIconData.renderingMode; + } + + return rm; + } + HbSharedIconInfo rasterIconData; HbSharedIconInfo vectorIconData; HbSharedIconInfo blobIconData;